]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 17 Jun 2013 17:06:42 +0000 (10:06 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Jun 2013 17:06:42 +0000 (10:06 -0700)
* fixes:
  ARM: dts: Correct the base address of pinctrl_3 on Exynos5250

1  2 
arch/arm/boot/dts/exynos5250-pinctrl.dtsi
arch/arm/boot/dts/exynos5250.dtsi

Simple merge