Jens Axboe 04bf7869ca Merge branch 'for-linus' into for-3.1/core ... Conflicts: block/blk-throttle.c block/cfq-iosched.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-07-01 16:17:13 +02:00
..
acorn.c
acorn.h
amiga.c
amiga.h
atari.c
atari.h
check.c	Merge branch 'for-linus' into for-3.1/core	2011-07-01 16:17:13 +02:00
check.h
efi.c	fs/partitions/efi.c: corrupted GUID partition tables can cause kernel oops	2011-05-26 17:12:37 -07:00
efi.h
ibm.c
ibm.h
karma.c
karma.h
Kconfig
ldm.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
ldm.h
mac.c
mac.h
Makefile
msdos.c
msdos.h
osf.c	Increase OSF partition limit from 8 to 18	2011-03-16 08:04:07 -07:00
osf.h
sgi.c
sgi.h
sun.c
sun.h
sysv68.c
sysv68.h
ultrix.c
ultrix.h