• Olof Johansson's avatar
    Merge branch 'picoxcell/cleanup' into next/cleanup · 844e8a16
    Olof Johansson authored
    * picoxcell/cleanup: (4 commits)
      MAINTAINERS: add maintainer entry for Picochip picoxcell
      ARM: picoxcell: move io mappings to common.c
      ARM: picoxcell: don't reserve irq_descs
      ARM: picoxcell: remove mach/memory.h
    
    Conflicts:
    	arch/arm/mach-at91/setup.c
    844e8a16
setup.c 7.13 KB