Merge tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linus...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jul 2012 15:32:06 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jul 2012 15:32:06 +0000 (08:32 -0700)
Pull late pinctrl fixes from Linus Walleij:
- Two fixes to the i.MX driver

* tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: pinctrl-imx6q: add missed mux function for USBOTG_ID
  pinctrl: pinctrl-imx: only print debug message when DEBUG is defined


Trivial merge