| commit | d472d1a1c82ade81d2854db2ff4c9694ed66612e | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 24 20:34:20 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 24 23:08:36 2010 +0100 |
| tree | 66b00d6d13a73ef4aff17bb35c72926d4cd12940 | |
| parent | 9bfe99a8f95122f83f3c894b1071b61e2b6d4990 [diff] | |
| parent | d01cd639c96cd683a22432afd4c39ea690c87f16 [diff] |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig