Merge branch 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:34:33 +0000 (07:34 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:34:33 +0000 (07:34 -0800)
From Stephen Warren:
* 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dt: tegra: fix length of pad control and mux registers


Trivial merge