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