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)
commit86822f816fc9a42fd210e35d4881e988406497c0
tree3bed5cb7891ef73eea4c58bdf105b98f4ff77a4a
parentd211093fbad99e6c38e168f71ca2ede64a51fe58
parent304b2c684e42af5b72d643322f783d88538dc817
Merge branch 'clps711x/cleanup' into next/cleanup

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>