From: Olof Johansson <olof@lixom.net>
Date: Tue, 6 Nov 2012 15:34:33 +0000 (-0800)
Subject: Merge branch 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc6~6^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfac74d38ec45bbdb80979ec966e1e703554c864;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-3.7/fixes-for-rc4' of git://git./linux/kernel/git/swarren/linux-tegra into fixes

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
---

dfac74d38ec45bbdb80979ec966e1e703554c864