diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
commit | 6ec4ed82e9cf2ee5c83fd529af69b2c63b004809 (patch) | |
tree | 437e1d7e42ed225862e50574a2f5a45ab38701d5 /arch/sh/include/asm/bitops.h | |
parent | 70888a4b412abd55c1710e2d36a9a00f4d23f474 (diff) | |
parent | 40364b9f5a4d167d97bb6a76cd239ca8cfff056a (diff) | |
download | blackbird-op-linux-6ec4ed82e9cf2ee5c83fd529af69b2c63b004809.tar.gz blackbird-op-linux-6ec4ed82e9cf2ee5c83fd529af69b2c63b004809.zip |
Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Minor DT updates based on the dt-missed-3.4 branch
By Benoit Cousson (3) and Peter Ujfalusi (2)
via Tony Lindgren
* tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm/dts: omap4-panda: Add LEDs support
arm/dts: omap4-sdp: Add LEDs support
arm/dts: twl4030: Add twl4030-gpio node
OMAP4: devices: Do not create mcpdm device if the dtb has been provided
OMAP4: devices: Do not create dmic device if the dtb has been provided
Diffstat (limited to 'arch/sh/include/asm/bitops.h')
0 files changed, 0 insertions, 0 deletions