From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2009 22:50:01 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: drm-fsl-dcu-for-next~18957
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=07a6d5a49c985ae6111221b93b3a48772cc4b976;p=linux-drm-fsl-dcu.git

Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Update mach-types
  ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
  MAINTAINERS: add maintainer information for AMBA primecell drivers
  [ARM] pxa/spitz: fix compile regression on spitz
  ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
  [ARM] pxa/cpufreq: fix index assignments for end marker
  ARM: PNX4008: fix watchdog device driver name
  [ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
---

07a6d5a49c985ae6111221b93b3a48772cc4b976