Merge branch 'for-3.6/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:16:37 +0000 (22:16 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 12 Jul 2012 15:35:23 +0000 (17:35 +0200)
commit8caec0d048609ccf8c75025b0d73af10f74e2157
treee0d28d93e032cd3351fa5e45f480a4985f76341e
parent1f2bbf310a40a3959d3e714d9dbd085878ce5346
parent0879c5f72f0a3905d08081e8a2c38e69896b0d5e
Merge branch 'for-3.6/dt' of git://git./linux/kernel/git/swarren/linux-tegra into next/dt

This branch contains changes to Tegra device tree files, and related
Kconfig and Makefile changes. Highlights are:

* New support for the Whistler board.
* Use of the I2C pinctrl-based bus mux on Seaboard/Springbank.

This branch is based on Tegra's for-3.6/cleanup branch from a previous
pull request.

* 'for-3.6/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.
  ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
  ARM: dt: tegra: add Whistler device tree file

Signed-off-by: Arnd Bergmann <arnd@arndb.de>