kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-10 20:48:12 +00:00
Code Issues Releases Packages Activity

Merge branch 'depends/omap-cleanup-headers-usb' into next/headers

Browse source 
Conflicts resolved same as Tony did in his later dependent branch:

	arch/arm/mach-omap1/clock.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-cm-t35.c
	arch/arm/mach-omap2/board-igep0020.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rm680.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/twl-common.c
	arch/arm/mach-omap2/usb-host.c
	arch/arm/mach-omap2/usb-musb.c

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-11-05 10:27:09 -08:00
commit 365480d67b
42 changed files with 201 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-omap1/clock.c
View file

1
arch/arm/mach-omap2/board-2430sdp.c
View file

1
arch/arm/mach-omap2/board-3430sdp.c
View file

1
arch/arm/mach-omap2/board-3630sdp.c
View file

2
arch/arm/mach-omap2/board-4430sdp.c
View file

1
arch/arm/mach-omap2/board-am3517crane.c
View file

2
arch/arm/mach-omap2/board-am3517evm.c
View file

5
arch/arm/mach-omap2/board-cm-t35.c
View file

1
arch/arm/mach-omap2/board-cm-t3517.c
View file

1
arch/arm/mach-omap2/board-devkit8000.c
View file

6
arch/arm/mach-omap2/board-igep0020.c
View file

3
arch/arm/mach-omap2/board-ldp.c
View file

7
arch/arm/mach-omap2/board-omap3beagle.c
View file

2
arch/arm/mach-omap2/board-omap3evm.c
View file

2
arch/arm/mach-omap2/board-omap3logic.c
View file

1
arch/arm/mach-omap2/board-omap3pandora.c
View file

1
arch/arm/mach-omap2/board-omap3stalker.c
View file

1
arch/arm/mach-omap2/board-omap3touchbook.c
View file

4
arch/arm/mach-omap2/board-omap4panda.c
View file

4
arch/arm/mach-omap2/board-overo.c
View file

4
arch/arm/mach-omap2/board-rm680.c
View file

2
arch/arm/mach-omap2/board-rx51.c
View file

3
arch/arm/mach-omap2/board-ti8168evm.c
View file

1
arch/arm/mach-omap2/board-zoom-peripherals.c
View file

1
arch/arm/mach-omap2/board-zoom.c
View file

2
arch/arm/mach-omap2/common.h
View file

4
arch/arm/mach-omap2/omap_phy_internal.c
View file

2
arch/arm/mach-omap2/twl-common.c
View file

3
arch/arm/mach-omap2/usb-host.c
View file

3
arch/arm/mach-omap2/usb-musb.c
View file

1
arch/arm/mach-omap2/usb-tusb6010.c
View file

82
arch/arm/mach-omap2/usb.h
View file

179
arch/arm/plat-omap/include/plat/usb.h
View file

5
drivers/mfd/omap-usb-host.c
View file

2
drivers/mfd/omap-usb-tll.c
View file

2
drivers/mfd/omap-usb.h
View file

3
drivers/usb/host/ehci-omap.c
View file

1
drivers/usb/host/ohci-omap3.c
View file

3
drivers/usb/musb/am35x.c
View file

3
drivers/usb/musb/musb_dsps.c
View file

2
drivers/usb/musb/omap2430.h
View file

80
include/linux/platform_data/usb-omap.h
View file