Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Jan 2011 10:31:54 +0000 (10:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Jan 2011 10:31:58 +0000 (10:31 +0000)
commitcde9efef401563943d5a58eb9b7274bfdc08ca9b
tree858a436055612db6282dc63db0fe3ba41147056a
parent50401d77ee4904673042dd737eed436067cc23f5
parent60ebe1568fd15b7ffa101acc645069e27d546ed6
Merge branch 'ux500-core' of git://git./linux/kernel/git/linusw/linux-stericsson into devel-stable
arch/arm/Kconfig
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/net/caif/caif_shm_u5500.c