]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
authorArnd Bergmann <arnd@arndb.de>
Mon, 6 Aug 2012 17:46:21 +0000 (19:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 6 Aug 2012 17:46:35 +0000 (19:46 +0200)
* 'board' of git://github.com/hzhuang1/linux:
  ARM: ttc_dkb: add nand support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge