review.tizen.org Git - platform/kernel/kernel-mfld-blackbay.git/commit

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 May 2010 10:52:31 +0000 (11:52 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 May 2010 10:53:39 +0000 (11:53 +0100)
commit	c39e52a793f5599582dbacf4d8f62634a492f79e
tree	7379649b5a722ceb45cc66f049a7571c66054dcd	tree \| snapshot
parent	762253741942d8ddbaca1c1ee62d7ed57544332b	commit \| diff
parent	8716011315a5b2fa932fa1e7570c34975ed2cb14	commit \| diff
parent	4fec9978822a66b25f5645eb20c115034a18cfd1	commit \| diff
parent	de4338f40e48da3b604219909a1d4aa7aa60870f	commit \| diff
parent	47ab0dee661dbd5aca67abe44a333e471134fbf9	commit \| diff
parent	2a847513cdecd517f7efc06296c539c3a936cf98	commit \| diff
parent	883413341e479d4e9f9c69def4884b4c6e1cef4e	commit \| diff
parent	3e9cc70590287f7cb7e38793bbf968b3362b7612	commit \| diff
parent	4c18e77f718cdda33363132127db4df795eadbd9	commit \| diff
parent	f417cbad7394fdccec850d13d7d5621516d693ce	commit \| diff

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts:
arch/arm/Makefile
arch/arm/common/Makefile
arch/arm/mm/Kconfig

arch/arm/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/common/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/common/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-at91/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history