From: Arnd Bergmann Date: Sun, 22 Apr 2012 20:54:46 +0000 (+0200) Subject: Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev X-Git-Tag: firefly_0821_release~3680^2~2748^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f81b2c49d31e763a9c1da831ceb6cef087cf6c6;p=firefly-linux-kernel-4.4.55.git Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev Wolfram Sang 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 --- 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6