diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-23 16:21:43 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-23 16:21:43 +0200 |
commit | 7dd84f065c5fea2c3af945b1e94cd734b3416fa8 (patch) | |
tree | 3e384110642babeb69dc7336b90a025c7fb3de3e /fs/btrfs/props.c | |
parent | 2008ee090c1b76dbbc435a39a6932854ee98d213 (diff) | |
parent | ce385a5e7a85c023af2e013101d4fe2240beec21 (diff) |
Merge tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "few minor fixes for omap dts files for v4.9 merge window"
Few fixes for omap dts files for v4.9 merge window. Let's also add
the tilcdc quirks:
- Fix typo with recent beagleboard-x15 changes for mmc2_pins_default
- Add am335x blue-and-red-wiring quirk as specified in the binding in
Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Also
fix up the whitespace formatting for am335x-evmsk.
- Fix for recent igepv5 power button for GPIO_ACTIVE_LOW. Also fix
up the whitespace formatting for the button
* tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap5-igep0050.dts: Use tabs for indentation
ARM: dts: Fix igepv5 power button GPIO direction
ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node
ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes
ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node
ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2
Diffstat (limited to 'fs/btrfs/props.c')
0 files changed, 0 insertions, 0 deletions