]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:42:46 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:42:46 +0000 (14:42 -0700)
commitfbe8ed634d3f7db92227d84363264868bd7ed751
treec473ea48a10283f354a21d1f9098fa7770c9158c
parent99bece775f988a4ee21ad3db9fd413caf1704ff6
parentd463f82d22f90096d1352de3837b1602a3410b5d
Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:
 "Two fixes to the pinctrl subsystem for v3.10:
   - A quite apparent mutex fix in an untested codepath
   - A compile warning fix in the plgpio driver"

* tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()
  pinctrl: plgpio: add CONFIG_PM_SLEEP to suspend/resume functions
drivers/pinctrl/spear/pinctrl-plgpio.c