]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b06040e 08ddbb0)
Merge branch 'fixes' into for-next
authorKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:18:08 +0000 (07:18 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:18:08 +0000 (07:18 -0700)
commit5e75e4478653fb72a15b187de34035e38e78b8ea
treef78111cb49e1eca0e6c53e4e232f231151506036tree | snapshot
parentb06040ea20e25a3bb5a432b333a581e3ba0b2bc1commit | diff
parent08ddbb0a899a4e7a9214bc7c063be436cabbc52acommit | diff
Merge branch 'fixes' into for-next

* fixes:
  MAINTAINERS: Add maintainers entry for Rockchip SoCs
  MAINTAINERS: Tegra updates, and driver ownership
  MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
  ARM: integrator: deactivate timer0 on the Integrator/CP
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency

Conflicts:
MAINTAINERS
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/boot/dts/integratorcp.dts diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules