| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jul 22 23:09:07 2011 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jul 22 23:09:07 2011 +0100 |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 [diff] | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf [diff] |
Merge branch 'devel-stable' into for-next Conflicts: arch/arm/kernel/entry-armv.S