| commit | 42578c82e0f1810a07ebe29cb05e874893243d8c | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Jun 11 15:35:00 2009 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jun 11 15:35:00 2009 +0100 |
| tree | e2a3811677d3594e891fc82c940438f6b6abc3e0 | |
| parent | 2631182bf93919577730e6a6c4345308db590057 [diff] | |
| parent | 85d6943af50537d3aec58b967ffbd3fec88453e9 [diff] |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel Conflicts: arch/arm/Kconfig arch/arm/kernel/smp.c arch/arm/mach-realview/Makefile arch/arm/mach-realview/platsmp.c