diff options
| author | Arnd Bergmann | 2012-11-15 17:59:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-11-15 17:59:54 +0100 |
| commit | cff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (patch) | |
| tree | 4ce5bef1e68a7cdd0567a6ab7c755fdbd9365d7b /drivers/usb/musb/omap2430.h | |
| parent | Merge tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ARM: OMAP2: Fix compillation error in cm_common (diff) | |
| download | kernel-qcow2-linux-cff9f37a1e7b2565f254b5ab40c3213cc0f823a1.tar.gz kernel-qcow2-linux-cff9f37a1e7b2565f254b5ab40c3213cc0f823a1.tar.xz kernel-qcow2-linux-cff9f37a1e7b2565f254b5ab40c3213cc0f823a1.zip | |
Merge branch 'omap/cleanup-prcm-part2' into next/dt
This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/musb/omap2430.h')
0 files changed, 0 insertions, 0 deletions