1
0
Fork 0
alistair23-linux/init
Greg Kroah-Hartman eb1574270a Merge 3.4-rc5 into driver-core-next
This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-02 14:33:37 -07:00
..
Kconfig documentation: remove references to cpu_*_map. 2012-03-29 15:38:31 +10:30
Makefile kbuild: move compile.h to include/generated 2009-12-12 13:08:14 +01:00
calibrate.c init: check printed flag to skip printing message 2012-03-23 16:58:38 -07:00
do_mounts.c init/do_mounts.c: print error code on mount failure 2012-03-23 16:58:38 -07:00
do_mounts.h md: move lots of #include lines out of .h files and into .c 2009-03-31 14:33:13 +11:00
do_mounts_initrd.c get rid of pointless includes of ext2_fs.h 2012-03-31 16:03:15 -04:00
do_mounts_md.c init: mark __user address space on string literals 2010-10-26 16:52:15 -07:00
do_mounts_rd.c new helper: ext2_image_size() 2012-03-31 16:03:16 -04:00
initramfs.c init/initramfs.c: should use umode_t 2012-01-03 22:55:14 -05:00
main.c Merge 3.4-rc5 into driver-core-next 2012-05-02 14:33:37 -07:00
noinitramfs.c init: mark __user address space on string literals 2010-10-26 16:52:15 -07:00
version.c userns: add a user_namespace as creator/owner of uts_namespace 2011-03-23 19:46:59 -07:00