From: Olof Johansson <olof@lixom.net>
Date: Thu, 10 May 2012 06:43:04 +0000 (-0700)
Subject: Merge branch 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.5-rc1~152^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7488185d0777ef84be7b365b08037fc7213010f6;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-3.5/gpio-pinmux' of git://git./linux/kernel/git/swarren/linux-tegra into next/pinctrl

By Stephen Warren
via Stephen Warren
* 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  pinctrl: tegra: error reporting cleanup
  pinctrl: tegra: debugfs enhancements
  pinctrl: tegra: refactor probe handling
  ARM: dt: tegra20: add pinmux to device tree
  ARM: dt: tegra cardhu: add pinmux to device tree
  ARM: tegra: Remove pre-pinctrl pinmux driver
  ARM: tegra: Switch to new pinctrl driver
  gpio: tegra: Hide tegra_gpio_enable/disable()
  ARM: tegra: seaboard: Don't gpio_request() ISL29018_IRQ
  gpio: tegra: configure pins during irq_set_type
  ARM: tegra: Remove VBUS_GPIO handling from board files
  usb: ehci-tegra: Add vbus_gpio to platform data
---

7488185d0777ef84be7b365b08037fc7213010f6