arch/arm/mach-omap2/board-4430sdp.c · 04aa67dec63b61c1a8b9b6d001262250f1a92130 · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus · 04aa67de
Tony Lindgren authored Feb 22, 2011
```
Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
```
04aa67de

board-4430sdp.c 13.5 KB