diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 12:50:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 12:50:04 -0700 |
| commit | 39b6cc668c5ecc66f6f9c9293ffab681cb6f7065 (patch) | |
| tree | f048b17a1b1a0a0f6d6a8d33459e8789c600c634 /arch/arm/include | |
| parent | 27953437059c64d14086196eb96f43c78caa9db3 (diff) | |
| parent | 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6 (diff) | |
Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc stmp-dev library code from Olof Johansson:
"A number of devices are using a common register layout, this adds
support code for it in lib/stmp_device.c so we do not need to
duplicate it in each driver."
Fix up trivial conflicts in drivers/i2c/busses/i2c-mxs.c and
lib/Makefile
* tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
i2c: mxs: use global reset function
lib: add support for stmp-style devices
Diffstat (limited to 'arch/arm/include')
0 files changed, 0 insertions, 0 deletions