]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and ...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
1  2  3  4  5  6  7 
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/arm/kernel/smp.c
drivers/mmc/host/mmci.c

Simple merge
Simple merge
Simple merge
Simple merge