git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
commit	2192482ee5ce5d5d4a6cec0c351b2d3a744606eb
tree	15ab3c23d05e98829741b03922b51b81fd102b64	tree \| snapshot (tar.gz zip)
parent	500b9fc922cbec572f4fd1436533bfaed5011262	commit \| diff
parent	a68fefe0d2f364ac3d8497ef37dcad713c261103	commit \| diff

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/Kconfig