Merge tag 'char-misc-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2013 04:10:48 +0000 (20:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2013 04:10:48 +0000 (20:10 -0800)
commitae763db4ce0300ccd844435c93c6c06bb6549560
tree2c53aa658004e1fb473ff6f71e1db942a820850e
parent6f48ea58dd039aa8627d378284031a8df8826dc9
parenta7e2ca17039edb5f782be519eaf9d8ea500ba7cc
Merge tag 'char-misc-3.8-rc4' of git://git./linux/kernel/git/gregkh/char-misc

Pull drivers/misc fix from Greg Kroah-Hartman:
 "Here is a single revert for the ti-st misc driver, fixing problem that
  was introduced in 3.7-rc1 that has been bothering people."

* tag 'char-misc-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "drivers/misc/ti-st: remove gpio handling"