tree f683d34d517465d62dcf2fd311f8f6e5d7e736b0
parent 3af03655e885ba7f48ca6318e231a7086a51082e
parent 2f8e7285606bcdf8f574bff633675eabcee83d5e
author Linus Torvalds <torvalds@linux-foundation.org> 1295996658 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1295996658 +1000

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

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ALSA: AACI: fix timeout duration
  ALSA: AACI: fix timeout condition checking
  ARM: 6636/1: ep93xx: default multiplexed gpio ports to gpio mode
  ARM: 6637/1: Make the argument to virt_to_phys() "const volatile"
  ARM: twd: ensure timer reload is reprogrammed on entry to periodic mode
  ARM: 6635/2: Configure reference clock for Versatile Express timers
  ARM: versatile: name configuration options after actual board names
  ARM: realview: name configuration options after actual board names
  ARM: realview,vexpress: fix section mismatch warning for pen_release
  ARM: 6632/3: mmci: stop using the blockend interrupts