Jens Axboe 698567f3fa Merge commit 'v2.6.39' into for-2.6.40/core ... Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-05-20 20:33:15 +02:00
..
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Makefile	ide: change to new flag variable	2011-03-17 14:05:34 +01:00
aec62xx.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
ali14xx.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
alim15x3.c	alim15x3: fix handling of UDMA enable bit	2010-01-19 01:52:31 -08:00
amd74xx.c	amd74xx: use ->pio_mode value to determine pair device speed	2010-01-19 01:52:32 -08:00
at91_ide.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
atiixp.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
au1xxx-ide.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6	2010-03-04 08:24:06 -08:00
buddha.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	2009-06-15 18:52:58 +02:00
cmd64x.c	cmd64x: fix handling of address setup timings	2010-01-19 01:52:32 -08:00
cmd640.c	cmd640: fix kernel oops in test_irq() method	2010-05-11 00:08:03 -07:00
cs5520.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
cs5530.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
cs5535.c	cs5535: use ->pio_mode value to determine pair device speed	2010-01-19 01:52:33 -08:00
cs5536.c	cs5536: use ->pio_mode value to determine pair device speed	2010-01-19 01:52:33 -08:00
cy82c693.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
delkin_cb.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
dtc2278.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
falconide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	2009-06-15 18:52:58 +02:00
gayle.c	m68k: amiga - Amiga Gayle IDE platform device conversion	2010-05-26 19:51:09 +02:00
hpt366.c	hpt366: fix clock turnaround	2010-10-26 10:17:29 -07:00
ht6560b.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
icside.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6	2010-03-02 23:57:59 -08:00
ide-4drives.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
ide-acpi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ide-atapi.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
ide-cd.c	block: don't block events on excl write for non-optical devices	2011-04-21 20:54:46 +02:00
ide-cd.h	ide: Convert to bdops->check_events()	2011-03-09 19:54:27 +01:00
ide-cd_ioctl.c	ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd	2011-04-21 19:43:59 +02:00
ide-cd_verbose.c	block: replace sizeof(rq->cmd) with BLK_MAX_CDB	2008-04-29 14:48:55 +02:00
ide-cs.c	pcmcia: remove obsolete and wrong comments	2010-09-29 17:20:25 +02:00
ide-devsets.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ide-disk.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ide-disk.h	[PATCH] switch ide_disk_ops ->ioctl() to sane prototype	2008-10-21 07:47:30 -04:00
ide-disk_ioctl.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
ide-disk_proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ide-dma-sff.c	ide: remove wmb() from ide-dma-sff.c and scc_pata.c	2009-04-08 14:12:49 +02:00
ide-dma.c	ide: clean up timed out request handling	2010-10-26 10:17:30 -07:00
ide-eh.c	block: remove wrappers for request type/flags	2010-08-07 18:17:56 +02:00
ide-floppy.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide-floppy.h	[PATCH] switch ide_disk_ops ->ioctl() to sane prototype	2008-10-21 07:47:30 -04:00
ide-floppy_ioctl.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
ide-floppy_proc.c	ide: convert to ->proc_fops	2009-09-01 17:52:57 -07:00
ide-gd.c	ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd	2011-04-21 19:43:59 +02:00
ide-gd.h	ide: move ->failed_pc to ide_drive_t	2009-03-27 12:46:34 +01:00
ide-generic.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
ide-h8300.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
ide-io-std.c	ide: refactor tf_read() method	2009-04-08 14:13:03 +02:00
ide-io.c	ide: always ensure that blk_delay_queue() is called if we have pending IO	2011-04-05 23:52:49 +02:00
ide-ioctls.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ide-iops.c	ide: add SATA cable detection support	2010-01-19 01:41:57 -08:00
ide-legacy.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
ide-lib.c	Merge branch 'master' into for-2.6.31	2009-05-22 20:28:35 +02:00
ide-park.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
ide-pci-generic.c	pata_piccolo: Driver for old Toshiba chipsets	2009-12-03 14:35:31 -05:00
ide-pio-blacklist.c	ide: move PIO blacklist to ide-pio-blacklist.c	2008-07-16 20:33:39 +02:00
ide-pm.c	block: remove wrappers for request type/flags	2010-08-07 18:17:56 +02:00
ide-pnp.c	ide: remove hw_regs_t typedef	2009-05-17 19:12:25 +02:00
ide-probe.c	ide: Fix ordering of procfs registry.	2010-09-13 21:34:25 -07:00
ide-proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ide-scan-pci.c	ide: replace remaining __FUNCTION__ occurrences	2008-04-26 22:25:20 +02:00
ide-sysfs.c	ide: move sysfs support to ide-sysfs.c	2009-01-02 16:12:48 +01:00
ide-tape.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
ide-taskfile.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide-timings.c	ide: ide_timing_compute() fixup	2010-01-19 11:30:09 -08:00
ide-xfer-mode.c	ide: make ide_get_best_pio_mode() static	2010-01-19 01:52:36 -08:00
ide.c	ide: use module_param_named rather than module_param_call	2010-08-11 23:04:39 +09:30
ide_platform.c	IDE: pass IRQ flags to the IDE core	2010-04-15 14:20:53 -07:00
it821x.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
it8172.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
it8213.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
jmicron.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
macide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	2009-06-15 18:52:58 +02:00
ns87415.c	ide: refactor tf_read() method	2009-04-08 14:13:03 +02:00
opti621.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
palm_bk3710.c	palm_bk3710: use ->pio_mode value to determine pair device speed	2010-01-19 01:52:34 -08:00
pdc202xx_new.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
pdc202xx_old.c	pdc202xx_old: ignore "FIFO empty" bit in test_irq() method	2010-04-22 19:11:24 -07:00
piix.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pmac.c	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
q40ide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	2009-06-15 18:52:58 +02:00
qd65xx.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
qd65xx.h	ide: do not access ide_drive_t 'drive_data' field directly	2009-06-15 22:13:44 +02:00
rapide.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rz1000.c	rz1000: apply chipset quirks early (v2)	2008-12-29 20:27:33 +01:00
sc1200.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
scc_pata.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6	2010-03-02 23:57:59 -08:00
serverworks.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
setup-pci.c	ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()	2009-06-10 14:37:21 +02:00
sgiioc4.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
siimage.c	siimage: use ->pio_mode value to determine pair device speed	2010-01-19 01:52:35 -08:00
sis5513.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sl82c105.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
slc90e66.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
tc86c001.c	ide: change ->set_dma_mode method parameters	2010-01-19 01:45:29 -08:00
triflex.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
trm290.c	ide: turn selectproc() method into dev_select() method (take 5)	2009-03-31 20:15:32 +02:00
tx4938ide.c	tx493xide: use min_t() macro instead of min()	2010-08-09 03:17:55 -07:00
tx4939ide.c	tx493xide: use min_t() macro instead of min()	2010-08-09 03:17:55 -07:00
umc8672.c	ide: change ->set_pio_mode method parameters	2010-01-19 01:44:41 -08:00
via82cxxx.c	Fix common misspellings	2011-03-31 11:26:23 -03:00