| commit | 7e95c548818d2b311090848083277fb907cfb56d | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:23:11 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:23:11 2012 -0700 |
| tree | 86fecf07ae1f01ba8bac5969974a7915b738baee | |
| parent | 6d55d5968a8622f3ea20ec40737aea1cfba6438c [diff] | |
| parent | 99261fbad0a16f105b262d7525801697588ba526 [diff] |
Merge branch 'next/dt' into HEAD Conflicts: Documentation/devicetree/bindings/usb/platform-uhci.txt arch/arm/mach-vt8500/bv07.c arch/arm/mach-vt8500/devices-vt8500.c arch/arm/mach-vt8500/devices-wm8505.c arch/arm/mach-vt8500/devices.c arch/arm/mach-vt8500/devices.h arch/arm/mach-vt8500/wm8505_7in.c