]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'samsung/board' into next/boards
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:25:33 +0000 (15:25 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:25:33 +0000 (15:25 +0000)
commit8ba242db86fa093a8463beef86f6304a49a730f0
treef21b5b1233bfdca0e8dca13d993f665474b039c0
parentfe163abc977682a4ed49e9f4199cea232974d4c5
parent39cb263eccc974765eed1100d48ac6f0986ef257
Merge branch 'samsung/board' into next/boards

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-crag6410-module.c
arch/arm/mach-s3c64xx/mach-crag6410.c