• Arnd Bergmann's avatar
    Merge tag 'omap-for-v3.9/usb-signed' of... · 6e7f7cfc
    Arnd Bergmann authored
    Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
    
    These changes contain the OMAP USB related platform data changes
    that were dropped from linux next because of the merge conflicts
    as requested by me and Olof. The reason was that at this point
    we really should be able to do the arch/arm related changes
    separately from driver changes to avoid dependencies between
    branches.
    
    These patches were initially part of the USB related MFD patches.
    Based on our comments, Roger Quadros quickly reworked these
    patches into a shared branch between ARM SoC tree and the MFD
    tree, then separate patches for the OMAP platform data and
    MFD driver.
    
    Note that this branch will conflict with c1d1cd59
    ("ARM: OMAP2+: omap_device: remove obsolete pm_lats and
    early_device code"). Please see http://lkml.org/lkml/2013/2/11/16
    for the merge resolution.
    
    [arnd - resolved the merge conflict]
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    6e7f7cfc
board-am3517crane.c 2.56 KB