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
..
acorn.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
acorn.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
amiga.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
amiga.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
atari.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
atari.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
check.c	fs: fixup warning part_discard_alignment_show()	2011-05-09 08:28:13 +02:00
check.h	block, partition: add partition_meta_info to hd_struct	2010-09-15 16:13:18 +02:00
efi.c	Validate size of EFI GUID partition entries.	2011-05-06 07:46:37 -07:00
efi.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
ibm.c	[S390] partitions: fix build error in ibm partition detection code	2010-08-13 10:06:55 +02:00
ibm.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
karma.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
karma.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
Kconfig	partition: use DEFAULT_SGI_PARTITION for SGI_PARTION default	2008-02-06 10:41:08 -08:00
ldm.c	fs/partitions/ldm.c: fix oops caused by corrupted partition table	2011-04-14 16:06:54 -07:00
ldm.h	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
mac.c	fs/partitions: Validate map_count in Mac partition tables	2011-02-17 17:50:51 -08:00
mac.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
Makefile	partition: add support for sysv68 partitions	2007-05-08 11:15:09 -07:00
msdos.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
msdos.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
osf.c	Increase OSF partition limit from 8 to 18	2011-03-16 08:04:07 -07:00
osf.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
sgi.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
sgi.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
sun.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
sun.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
sysv68.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
sysv68.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00
ultrix.c	partitions: fix sometimes unreadable partition strings	2010-08-11 08:59:20 -07:00
ultrix.h	block: use struct parsed_partitions *state universally in partition check code	2010-05-21 20:01:02 +02:00