| commit | 38494429f383c8c0bda1d462f6be3d54f1dc1fed | |
| author | Kevin Hilman <khilman@linaro.org> | |
| Tue, 13 Aug 2013 23:49:26 +0000 (13 16:49 -0700) | ||
| committer | Kevin Hilman <khilman@linaro.org> | |
| Tue, 13 Aug 2013 23:49:41 +0000 (13 16:49 -0700) | ||
| tree | 725821f7d734beb2baa42006e391f876d5a2c87a | treesnapshot (tar.gz zip) |
| parent | 19dab4ce09df0f11debc57a20a57e176adf9f31f | commitdiff |
| parent | 93c5a5b179dfd79438c0744fc02af0abf11edbb9 | commitdiff |
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>
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>