Merge branch 'next/dt' into HEAD (7e95c548) · Commits · Clea OS / bsp / nxp / linux-seco-imx

Commit 7e95c548 authored 12 years ago by Olof Johansson

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

parents 6d55d596 99261fba

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 957 additions and 0 deletions

Please register or to comment