git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d55d59 99261fb)
Merge branch 'next/dt' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
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


Trivial merge
Pandora Kernel Repository