From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 13 Aug 2013 23:49:26 +0000 (-0700)
Subject: Merge branch 'pxa/dt' into next/dt
X-Git-Tag: v3.12-rc1~116^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=38494429f383c8c0bda1d462f6be3d54f1dc1fed;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'pxa/dt' into next/dt

From: Haojian Zhuang <haojian.zhuang@gmail.com>:
* pxa/dt:
  ARM: pxa: DTS: override gpio node in pxa3xx.dtsi
  ARM: pxa: fix DT auxdata for pxa3xx-gpio

Signed-off-by: Kevin Hilman <khilman@linaro.org>
---

38494429f383c8c0bda1d462f6be3d54f1dc1fed