commit ca9ba4471c1203bb6e759b76e83167fec54fe590
author Linus Torvalds <torvalds@g5.osdl.org> Tue Mar 28 13:53:03 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Mar 28 13:53:03 2006 -0800
tree 8aeb359631742f77f635cb5ff785bea9132502f9
parent d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9
parent c4713074375c61f939310b04e92090afe29810dc

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3388/1: ixp23xx: add core ixp23xx support
  [ARM] 3417/1: add support for logicpd pxa270 card engine
  [ARM] 3387/1: ixp23xx: add defconfig
  [ARM] 3377/2: add support for intel xsc3 core
  [ARM] Move ice-dcc code into misc.c
  [ARM] Fix decompressor serial IO to give CRLF not LFCR
  [ARM] proc-v6: mark page table walks outer-cacheable, shared.  Enable NX.
  [ARM] nommu: trivial patch for arch/arm/lib/Makefile
  [ARM] 3416/1: Update LART site URL
  [ARM] 3415/1: Akita: Add missing EXPORT_SYMBOL
  [ARM] 3414/1: ep93xx: reset ethernet controller before uncompressing