]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit1694a0a08e85baade75752a6a902a2fa30d608e8
tree6369d7c382b721a768c951fe1489784ccd2bfb31
parent84a1caf1453c3d44050bd22db958af4a7f99315c
parent4a5f7eff8b0b34354e5c63272835e5e2dfe1c933
Merge tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

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