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	[PATCH] Remove unused kernel config option PARIDE_PARPORT	2007-02-11 11:18:06 -08:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Transition-notes	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
aten.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
bpck.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
bpck6.c	[PATCH] paride: remove parport #ifdef's	2006-12-07 08:39:45 -08:00
comm.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
dstr.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
epat.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
epia.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
fit2.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
fit3.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
friq.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
frpw.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
kbic.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
ktti.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
mkd	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
on20.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
on26.c	[PATCH] paride_register(): shuffle return values	2006-12-07 08:39:33 -08:00
paride.c	[PATCH] paride: remove parport #ifdef's	2006-12-07 08:39:45 -08:00
paride.h	[PATCH] paride: rename pi_register() and pi_unregister()	2006-12-07 08:39:33 -08:00
pcd.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
pd.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
pf.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
pg.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
ppc6lnx.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pseudo.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
pt.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00