summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-01 20:48:42 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-01 20:48:42 -0700
commit878701db07db3f0b59f14f0c525b681e4ca81551 (patch)
tree132083fef920c0df6e41379909d3f071f2d68032 /arch/ia64
parent04668873daa822aa6c806ba28d1143db8dcb26e8 (diff)
parent3fcece66911c9d485c1e2050ba033fde607b5130 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: scc_pata: PIO fixes piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2) jmicron: PIO fixes it8213: PIO fixes (take 2) cs5535: PIO fixes cs5520: fix PIO auto-tuning in ->ide_dma_check method drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc ide: eliminate warnings in ide-tape.c ide: fix runtogether printk's in cmd64x IDE driver sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops alim15x3: Correct HP detect ide: Fix an overrun found in the CS5535 IDE driver
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions