From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Jan 2011 23:04:18 +0000 (+1000)
Subject: Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.38-rc3~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6663050edd9c2e8b1e1f55c09459144d84c045f0;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'fixes' of /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
---

6663050edd9c2e8b1e1f55c09459144d84c045f0