summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings/pinctrl
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-10-14 20:33:07 +0200
committerTony Lindgren <tony@atomide.com>2013-10-14 20:33:07 +0200
commitf41509ad0d4c11d0911630440749d409ce2aa1aa (patch)
treecacd9b3637d905af7618262cec4d9113e147a5f4 /include/dt-bindings/pinctrl
parentLinux 3.12-rc5 (diff)
parentMerge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentARM: configs: omap2plus_defconfig: enable dwc3 and dependencies (diff)
downloadlinux-f41509ad0d4c11d0911630440749d409ce2aa1aa.tar.xz
linux-f41509ad0d4c11d0911630440749d409ce2aa1aa.zip
Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal
We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and the platform data quirk changes in omap-for-v3.13/quirk to start removing omap3 board files without breaking things.