]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'clps711x/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Sun, 13 May 2012 20:07:49 +0000 (22:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 13 May 2012 20:07:49 +0000 (22:07 +0200)
* clps711x/cleanup:
  ARM: clps711x: Combine header files into one for clps711x-targets

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

Trivial merge