From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2010 01:11:49 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a6a432a9ce55876b92f9ea860d7baa05538de16;p=openwrt%2Fstaging%2Fblogic.git

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

2a6a432a9ce55876b92f9ea860d7baa05538de16