tree b02eb734176bde952a5fa11ba788bee94846b46a
parent f9220c239f24e4d85a6a4f7eb9a8d9f251bd27ab
parent 3edfe0030bb7a82dab2a30a29ea6e1800e600c4b
author Linus Torvalds <torvalds@linux-foundation.org> 1412277790 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1412277790 -0700

Merge branch 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

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