| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:32:52 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:32:52 2011 +0000 |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a [diff] | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea [diff] |
Merge branch 'misc' into devel Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c