diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 21:50:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 21:50:04 +0200 |
| commit | 39b6cc668c5ecc66f6f9c9293ffab681cb6f7065 (patch) | |
| tree | f048b17a1b1a0a0f6d6a8d33459e8789c600c634 /arch/arm/mach-mxs/devices | |
| parent | Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into nex... (diff) | |
| download | linux-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.tar.xz linux-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.zip | |
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/mach-mxs/devices')
0 files changed, 0 insertions, 0 deletions