From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Jan 2017 18:56:56 +0000 (-0800)
Subject: Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.10-rc6~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c5d9555d6d937966d79d4c6529a5f7b9206e405;p=karo-tx-linux.git

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

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
---

2c5d9555d6d937966d79d4c6529a5f7b9206e405