path: root/Makefile
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-22 11:13:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-22 11:13:02 -0800
commit93579aeec2093ff12b55491c655129431b63e3dd (patch)
treefe2def1033b4aada50a27788adce9a6506183504 /Makefile
parentba8b844f1b47f003d8d0af94275dc5bc7ab9665d (diff)
parent95fcfa70f3bc4b3b82bf582fa5b24a39bdbd23ae (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "Much smaller batch of fixes this week. Biggest one is a revert of an OMAP display change that removed some non-DT pinmux code that was still needed for 3.13 to get DSI displays to work. There's also a fix that resolves some misdescribed GPIO controller resources on shmobile. The rest are mostly smaller fixes, a couple of MAINTAINERS updates, etc" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: Revert "ARM: OMAP2+: Remove legacy mux code for display.c" MAINTAINERS: Add keystone clock drivers MAINTAINERS: Add keystone git tree information ARM: s3c64xx: dt: Fix boot failure due to double clock initialization 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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions