tree f5668642a7a2fe0eb1e6ceb519f4a9832bf687c8
parent 8733449b7c6aca8dc5357720c00633b0dfa78207
parent 90c5ffe592ff3b33afe2bdfe5e9ec630fc599e32
author Linus Torvalds <torvalds@linux-foundation.org> 1310308110 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310308110 -0700

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