• Linus Torvalds's avatar
    Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm · 63a93699
    Linus Torvalds authored
    * 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6629/2: aaec2000: remove support for mach-aaec2000
      ARM: lh7a40x: remove unmaintained platform support
    
    Fix up trivial conflicts in
     - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
     - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
    63a93699
Makefile 2.19 KB