From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jul 2011 14:28:30 +0000 (-0700)
Subject: Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.0-rc7~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7fc7693627f363820c0e95d1e082f73c197f83c4;p=linux.git

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
  ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
  ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
  ARM: 6980/1: mmci: use StartBitErr to detect bad connections
  ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
  ARM: move memory layout sanity checking before meminfo initialization
  ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
  ARM: 6989/1: perf: do not start the PMU when no events are present
  ARM: dmabounce: fix map_single() error return value
---

7fc7693627f363820c0e95d1e082f73c197f83c4