From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Oct 2014 19:23:10 +0000 (-0700)
Subject: Merge branch 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: firefly_0821_release~176^2~3156
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80ec7ce7bf50f57d0c37c09c5ed95f7f88370da1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'parisc-3.17-8' of git://git./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
---

80ec7ce7bf50f57d0c37c09c5ed95f7f88370da1