Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
Russell King [Mon, 3 Jan 2011 10:31:54 +0000 (10:31 +0000)]
1  2 
arch/arm/Kconfig
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/net/caif/caif_shm_u5500.c

Simple merge
Simple merge
Simple merge
Simple merge