diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 21:36:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 21:36:50 -0700 |
| commit | 6dda8e594bde0a2ca0d5e64c6e0240e76166fa69 (patch) | |
| tree | eb8fdc70db202197b14af35e59289e0697086a6a /kernel/sys.c | |
| parent | 89d70e99fff9012fe8a38363f2c46e6ee23a6f47 (diff) | |
| parent | d0e3bc813359360fb94098fec9403820846577f3 (diff) | |
Merge tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
Merge "Ux500 devicetree changes for v3.17" from Linus Walleij:
Ux500 device tree patches for v3.17:
- Add regulators to STMPE expanders
- Add proper DMA channels for all SD/MMC blocks
- Add sensors to the device tree
* tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: add misc sensors to the device trees
ARM: ux500: add some DB8500 DMA channel info
ARM: ux500: add VCC and VIO regulators to STMPE IC
+ Linux 3.16-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/sys.c')
0 files changed, 0 insertions, 0 deletions