Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Sep 2012 16:20:48 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Sep 2012 16:20:48 +0000 (09:20 -0700)
Pull SuperH fix from Paul Mundt:
 "One last minute regression fix.."

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: pfc: Fix up GPIO mux type reconfig case.


Trivial merge