Skip to content
Commit 3f81b2c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e816b57a 6b866c15
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment