diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-29 14:26:35 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-29 14:26:35 -0700 |
commit | 99261fbad0a16f105b262d7525801697588ba526 (patch) | |
tree | 4ec0482e58f36bcabe49d47843cbbc7d34b73ebb /arch/arm/mach-mxs/mach-mxs.c | |
parent | 325f06713337928df572d12d65bdaf91f4d53d83 (diff) | |
parent | 07c7e12ca7e32e942d2c42dd67329c5fc3886b07 (diff) | |
download | blackbird-op-linux-99261fbad0a16f105b262d7525801697588ba526.tar.gz blackbird-op-linux-99261fbad0a16f105b262d7525801697588ba526.zip |
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/arm/mach-mxs/mach-mxs.c')
0 files changed, 0 insertions, 0 deletions