Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev
authorArnd Bergmann <arnd@arndb.de>
Sun, 22 Apr 2012 20:54:46 +0000 (22:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 22 Apr 2012 20:54:46 +0000 (22:54 +0200)
commit3f81b2c49d31e763a9c1da831ceb6cef087cf6c6
treee261299ccded5d87db92850b8dfdadab8ae2c514
parente816b57a337ea3b755de72bec38c10c864f23015
parent6b866c151ad9ea44799b32c3a8c90a03c5b981da
Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev

Wolfram Sang <w.sang@pengutronix.de> writes:
  This series makes support for a certain type of devices mach independant. We
  want that because such devices (having a special register layout) have been
  found in mach-mxs and mach-mx6 meanwhile.

Since there is no subsystem maintainer for lib/ and the use case is
currently only for ARM systems, I have agreed to merge these through
the arm-soc tree.

* 'stmp_device' of git://git.pengutronix.de/git/wsa/linux:
  i2c: mxs: use global reset function
  lib: add support for stmp-style devices

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