Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 02:05:40 +0000 (19:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 02:05:40 +0000 (19:05 -0700)
commit63a93699c6a58795b854ff573542a08367684dae
tree057ab4cbde66862c51867dde030be69a2fa7073f
parent16d8775700f1815076f879719ce14b33f50a3171
parent21bd6d37cf23e643020bf28b41844ff0040c9393
Merge branch 'remove' of /home/rmk/linux-2.6-arm

* '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)
arch/arm/Kconfig
arch/arm/Makefile
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci.h