projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19dab4c 93c5a5b)
Merge branch 'pxa/dt' into next/dt
authorKevin Hilman <khilman@linaro.org>
Tue, 13 Aug 2013 23:49:26 +0000 (16:49 -0700)
committerKevin Hilman <khilman@linaro.org>
Tue, 13 Aug 2013 23:49:41 +0000 (16:49 -0700)
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>

Trivial merge
Domain: System / Uncategorized;