Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

author Russell King <[email protected]>

Mon, 3 Jan 2011 10:31:54 +0000 (10:31 +0000)

committer Russell King <[email protected]>

Mon, 3 Jan 2011 10:31:58 +0000 (10:31 +0000)
author Russell King <[email protected]>
Mon, 3 Jan 2011 10:31:54 +0000 (10:31 +0000)
committer Russell King <[email protected]>
Mon, 3 Jan 2011 10:31:58 +0000 (10:31 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/input/keyboard/Kconfig
Simple merge
diff --cc drivers/input/keyboard/Makefile
Simple merge
diff --cc drivers/net/caif/caif_shm_u5500.c
Simple merge
author	Russell King <[email protected]>
	Mon, 3 Jan 2011 10:31:54 +0000 (10:31 +0000)
committer	Russell King <[email protected]>
	Mon, 3 Jan 2011 10:31:58 +0000 (10:31 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/caif/caif_shm_u5500.c	patch \|	diff1 \|	diff2 \|	blob \| history