summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 03:05:40 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 03:05:40 +0100
commit63a93699c6a58795b854ff573542a08367684dae (patch)
tree057ab4cbde66862c51867dde030be69a2fa7073f /arch/m68k
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentARM: 6629/2: aaec2000: remove support for mach-aaec2000 (diff)
downloadlinux-63a93699c6a58795b854ff573542a08367684dae.tar.xz
linux-63a93699c6a58795b854ff573542a08367684dae.zip
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)
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions