commit 155171274d1dd9d9e5a012bd912c592402aa31d2
author Arnd Bergmann <arnd@arndb.de> Tue May 12 15:37:01 2015 +0200
committer Arnd Bergmann <arnd@arndb.de> Tue May 12 15:37:01 2015 +0200
tree 0e1e26648de1e3229c918d37b4bdcee61f612254
parent 030bbdbf4c833bc69f502eae58498bc5572db736
parent a4b6916cb3578b05f30ef520cd6deb7f8fd97dda

Merge tag 'tegra-for-4.1-fixes-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into fixes

Merge "ARM: tegra: Device tree fixes for v4.1-rc3" from Thierry Reding:

This contains a fix for a bug that was introduced a couple of months ago
by a patch that git misapplied because of a lack of context.

* tag 'tegra-for-4.1-fixes-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct which USB controller has the UTMI pad registers