| commit | ceb0885d3b01bb2e2f18765770e212914f2864be | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Jul 31 14:20:02 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Jul 31 14:20:02 2010 +0100 |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d [diff] | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 [diff] |
Merge branch 'misc' into devel Conflicts: arch/arm/mm/init.c