| commit | 56012808f4d5606e401539f663d92009d964425b | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Feb 15 21:20:18 2010 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Feb 15 21:20:18 2010 +0000 |
| tree | f3736a97725647393a2db7c95462d857115197ca | |
| parent | a814290e17ae314bd614476cffc6119846eca27e [diff] | |
| parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a [diff] |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable Conflicts: arch/arm/Makefile