Merge branch 'for-spi' into s5p-fixes-for-linus
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 6 Jul 2011 06:46:41 +0000 (15:46 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 6 Jul 2011 06:46:41 +0000 (15:46 +0900)
1  2 
arch/arm/mach-s5pc100/dev-spi.c

Simple merge