Merge branch 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Oct 2014 19:23:10 +0000 (12:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Oct 2014 19:23:10 +0000 (12:23 -0700)
Pull parisc fix from Helge Deller:
 "One late but trivial patch to fix the serial console on parisc
  machines which got broken during the 3.17 release cycle"

* 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix serial console for machines with serial port on superio chip


Trivial merge