Jens Axboe 7407cf355f Merge branch 'master' into for-2.6.35 ... Conflicts: fs/block_dev.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-04-29 09:36:24 +02:00
..
calibrate.c	timers, init: Limit the number of per cpu calibration bootup messages	2009-11-26 10:18:42 +01:00
do_mounts.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
do_mounts.h
do_mounts_initrd.c	init: Open /dev/console from rootfs	2010-03-03 14:56:07 -05:00
do_mounts_md.c
do_mounts_rd.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
initramfs.c	initramfs: handle unrecognised decompressor when unpacking	2010-04-24 11:31:26 -07:00
Kconfig	blk-cgroup: config options re-arrangement	2010-04-26 19:27:56 +02:00
main.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
Makefile	kbuild: move compile.h to include/generated	2009-12-12 13:08:14 +01:00
noinitramfs.c
version.c	kbuild: move utsrelease.h to include/generated	2009-12-12 13:08:15 +01:00