diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-17 11:39:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-17 11:39:54 -0700 |
commit | 3bc6c906eacec34f0d8dcfd3c7e4513edf152297 (patch) | |
tree | 6fdca669a44a3084d140fffeda7fc4a157b5772b /drivers/input | |
parent | 99f781b1bfc199ec8eb86d4e015920faf79d5d57 (diff) | |
parent | d6957f3396d0b1ee54d183524550d791054b5ebe (diff) |
Merge branch 'parisc-4.13-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
- Fix PCI memory bar assignments with 64-bit kernels on machines with
Dino/Cujo PCI chipsets. This makes PCI graphic cards work on such
machines (from Thomas Bogendoerfer).
- Fix documentation to be more clear about the difference between %pF
and %pS printk format usage. There are still many places in the
kernel which have it wrong (from Petr Mladek, Sergey Senozhatsky &
me).
* 'parisc-4.13-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
printk-formats.txt: Better describe the difference between %pS and %pF
parisc: pci memory bar assignment fails with 64bit kernels on dino/cujo
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions