| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Jul 31 14:20:16 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Jul 31 14:20:16 2010 +0100 |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 | |
| parent | ceb0885d3b01bb2e2f18765770e212914f2864be [diff] | |
| parent | a20df564d15bd28e3df24e1c65b885bd74d23f17 [diff] |
Merge branch 'devel-stable' into devel Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c