]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
commit66dffe6be9e6e191583712cdde7840ebbfdde971
treeb02319e809c5b8abfca85409a11472775e27f597
parent1bb8e768243cd4306839a1c0a28108c213379e9c
parentb6893c916acea644992437b5d05d39e7f41501c8
Merge branch 'misc' into for-linus

Conflicts:
arch/arm/mach-integrator/integrator_ap.c
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/include/asm/system.h
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-integrator/integrator_ap.c