Skip to content

Commit

Permalink
Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
Browse files Browse the repository at this point in the history
* '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)
  • Loading branch information
torvalds committed Mar 17, 2011
2 parents 16d8775 + 21bd6d3 commit 63a9369
Show file tree
Hide file tree
Showing 76 changed files with 1 addition and 8,400 deletions.
61 changes: 0 additions & 61 deletions Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen

This file was deleted.

32 changes: 0 additions & 32 deletions Documentation/arm/Sharp-LH/CompactFlash

This file was deleted.

45 changes: 0 additions & 45 deletions Documentation/arm/Sharp-LH/IOBarrier

This file was deleted.

8 changes: 0 additions & 8 deletions Documentation/arm/Sharp-LH/KEV7A400

This file was deleted.

59 changes: 0 additions & 59 deletions Documentation/arm/Sharp-LH/LCDPanels

This file was deleted.

15 changes: 0 additions & 15 deletions Documentation/arm/Sharp-LH/LPD7A400

This file was deleted.

16 changes: 0 additions & 16 deletions Documentation/arm/Sharp-LH/LPD7A40X

This file was deleted.

51 changes: 0 additions & 51 deletions Documentation/arm/Sharp-LH/SDRAM

This file was deleted.

80 changes: 0 additions & 80 deletions Documentation/arm/Sharp-LH/VectoredInterruptController

This file was deleted.

Loading

0 comments on commit 63a9369

Please sign in to comment.