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)
commitdfac74d38ec45bbdb80979ec966e1e703554c864
tree6f6c1ffd1d73ae2958209158d5a5d90c4ce52db0
parente32643544d8d9e7776daf0a4e803c57b54ba77f0
parent322337b8fbd8c392246529d5db924820fc0c7381
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