tree 66b00d6d13a73ef4aff17bb35c72926d4cd12940
parent 9bfe99a8f95122f83f3c894b1071b61e2b6d4990
parent d01cd639c96cd683a22432afd4c39ea690c87f16
author Russell King <rmk+kernel@arm.linux.org.uk> 1274729660 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1274738916 +0100

Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig