Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 19:34:20 +0000 (20:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 22:08:36 +0000 (23:08 +0100)
commitd472d1a1c82ade81d2854db2ff4c9694ed66612e
tree66b00d6d13a73ef4aff17bb35c72926d4cd12940
parent9bfe99a8f95122f83f3c894b1071b61e2b6d4990
parentd01cd639c96cd683a22432afd4c39ea690c87f16
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile