Colin Cross 633c6f1b21 Merge commit 'v3.4.5' into android-3.4 ... Conflicts: drivers/base/power/main.c Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0		2012-07-16 15:25:51 -07:00
..
calibrate.c	init: check printed flag to skip printing message	2012-03-23 16:58:38 -07: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
do_mounts.c	init: don't try mounting device as nfs root unless type fully matches	2012-05-05 10:04:40 -07:00
do_mounts.h
initramfs.c	init/initramfs.c: should use umode_t	2012-01-03 22:55:14 -05:00
Kconfig	Add build option to to set the default panic timeout.	2012-04-09 13:53:08 -07:00
main.c	module_param: stop double-calling parameters.	2012-06-17 11:21:23 -07:00
Makefile
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