git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 23 May 2011 17:05:10 +0000 (18:05 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 23 May 2011 17:05:10 +0000 (18:05 +0100)
commit	4b60e5f90dec4ae251386f20464336369e962e9c
tree	13ca50e109a23bcc5e1622ca658000cb85668d1e	tree \| snapshot
parent	e8765afe54b72b85ffe2b60683710ff450a92912	commit \| diff
parent	667f390bee987d45351402e42008c52cdfb77d76	commit \| diff
parent	a35d4e58737116fd4126c240a1faeb735839435e	commit \| diff
parent	4d5336d50a7b4992c90729c27dae027a3426c48c	commit \| diff
parent	041f10d46f97c87f8ae1cdb4117682214732cc45	commit \| diff
parent	be20902ba67de70b38c995903321f4152dee57b7	commit \| diff

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

arch/arm/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-integrator/integrator_cp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-realview/core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-vexpress/ct-ca9x4.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/mtd/maps/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history