]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
commitb4723567470ab9decdc324ff554ef5739b6fef55
tree0952c90cd49704a9172e985ca491d79b60c40bc8
parent988d0fe0c7801720f459024dd9591348f0265e65
parent6ebac138af68b8fe360279afce717673dbf68839
Merge branch 'misc' into devel

Conflicts:
arch/arm/mm/init.c
arch/arm/Kconfig
arch/arm/include/asm/memory.h
arch/arm/kernel/machine_kexec.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c