| commit | a0a55682b83fd5f012afadcf415b030d7424ae68 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Oct 18 22:34:47 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Oct 18 22:34:47 2010 +0100 |
| tree | 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 | |
| parent | 23beab76b490172a9ff3d52843e4d27a35b2a4c6 [diff] | |
| parent | 865a4fae7793b80e2b8bca76e279d6dfecbeac17 [diff] |
Merge branch 'hotplug' into devel Conflicts: arch/arm/kernel/head-common.S