summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-29 14:26:35 -0700
committerOlof Johansson <olof@lixom.net>2012-09-29 14:26:35 -0700
commit99261fbad0a16f105b262d7525801697588ba526 (patch)
tree4ec0482e58f36bcabe49d47843cbbc7d34b73ebb /arch/s390
parent325f06713337928df572d12d65bdaf91f4d53d83 (diff)
parent07c7e12ca7e32e942d2c42dd67329c5fc3886b07 (diff)
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
From Roland Stigge. Pulling in one bugfix to the lpc32xx DT conversion. * 'lpc32xx/dts' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: LED fix in PHY3250 DTS file
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions