]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'samsung-fixes-2' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 3 Dec 2011 10:11:33 +0000 (19:11 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 3 Dec 2011 10:11:33 +0000 (19:11 +0900)
1  2 
arch/arm/mach-s3c64xx/dev-spi.c
drivers/tty/serial/Kconfig

Simple merge
Simple merge