| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 02 23:40:15 2010 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 02 23:40:15 2010 +0000 |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 [diff] | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 [diff] |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile