From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2011 02:05:40 +0000 (-0700)
Subject: Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.39-rc1~462
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63a93699c6a58795b854ff573542a08367684dae;p=pandora-kernel.git

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)
---

63a93699c6a58795b854ff573542a08367684dae
Reading git-diff-tree failed