]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'fixes' into for-next
authorKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 20:20:45 +0000 (12:20 -0800)
committerKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 20:20:45 +0000 (12:20 -0800)
commit759811af143fa8ca2a3e3e1af9edb10b27b8f00e
treeb24301e8fe547c49e8751144cc8f17c5aa59d501
parentbe08ff5ca5eebde1386494c546bf161151cf51aa
parent95fcfa70f3bc4b3b82bf582fa5b24a39bdbd23ae
Merge branch 'fixes' into for-next

* fixes:
  Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
  MAINTAINERS: Add keystone clock drivers
  MAINTAINERS: Add keystone git tree information
  ARM: shmobile: r8a7790: Fix GPIO resources in DTS
  irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation
  ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB
MAINTAINERS
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/mach-shmobile/board-lager.c