Stephen Boyd 84d1c1a3a3 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 ... Fix NR_IPI to be 7 instead of 6 because both googly and core add an IPI. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/include/asm/hardware/cache-l2x0.h arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c include/linux/wakelock.h kernel/power/Kconfig kernel/power/Makefile kernel/power/main.c kernel/power/power.h		2013-02-25 11:25:46 -08:00
..
calibrate.c	init: check printed flag to skip printing message	2012-03-23 16:58:38 -07: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
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
do_mounts_rd.c	new helper: ext2_image_size()	2012-03-31 16:03:16 -04:00
initramfs.c
Kconfig	Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4	2013-02-25 11:25:46 -08:00
main.c	init: apply SCHED_FIFO to kthreadd	2013-02-08 15:14:32 -08:00
Makefile
noinitramfs.c
version.c