tree f64431e3f5f105ee350831aef6810281d93e10b1
parent a7c8962bfbc730a9acc0a635bad0f9628b6e816a
parent 99c796df94afca5256860dd4760017f1dbb3480c
author Linus Torvalds <torvalds@linux-foundation.org> 1282093909 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282093909 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  VIDEO: amba clcd: don't disable an already disabled clock
  ARM: Tighten check for allowable CPSR values
  ARM: 6329/1: wire up sys_accept4() on ARM
  ARM: 6328/1: Build with -fno-dwarf2-cfi-asm
  ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used