]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jan 2017 18:56:56 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jan 2017 18:56:56 +0000 (10:56 -0800)
Pull two parisc fixes from Helge Deller:
 "One fix to avoid usage of BITS_PER_LONG in user-space exported swab.h
  header which breaks compiling qemu, and one trivial fix for printk
  continuation in the parisc parport driver"

* 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header
  parisc, parport_gsc: Fixes for printk continuation lines


Trivial merge