]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'clps711x/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 May 2012 14:18:22 +0000 (16:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 11 May 2012 14:18:22 +0000 (16:18 +0200)
A single patch from Alexander Shiyan <shc_work@mail.ru>:

* clps711x/cleanup:
  ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset

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

Trivial merge