| commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 11 10:55:04 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 11 10:55:04 2012 +0100 |
| tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b | |
| parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 [diff] | |
| parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 [diff] |
Merge branch 'fixes' into for-linus Conflicts: arch/arm/kernel/smp.c