Merge branch 'pxa/dt' into next/dt

Browse source

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>

...

This commit is contained in:

Kevin Hilman 2013-08-13 16:49:26 -07:00

parent 19dab4ce09 93c5a5b179

commit 38494429f3

2 changed files with 12 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

arch/arm/boot/dts/pxa3xx.dtsi

View file

2

arch/arm/mach-pxa/pxa-dt.c

View file