tree 057ab4cbde66862c51867dde030be69a2fa7073f
parent 16d8775700f1815076f879719ce14b33f50a3171
parent 21bd6d37cf23e643020bf28b41844ff0040c9393
author Linus Torvalds <torvalds@linux-foundation.org> 1300327540 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300327540 -0700

Merge branch 'remove' of master.kernel.org:/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)