• Olof Johansson's avatar
    Merge branch 'fixes-non-critical' into next/drivers2 · 1f5b7dcf
    Olof Johansson authored
    fixes-non-critical has already been merged upstream, and there are a
    handful of annoying context conflicts that it makes sense to resolve
    before sending up. Part of this is because there was parallel development
    going on between more urgent fixes and general driver fixups, it should
    settle down once the lpc32xx platform reaches a more steady state.
    
    Conflicts:
    	arch/arm/mach-lpc32xx/clock.c
    	arch/arm/mach-lpc32xx/common.h
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    1f5b7dcf
common.h 2.25 KB