summaryrefslogtreecommitdiff
path: root/lib/pm-notifier-error-inject.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-19 20:23:56 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-19 20:23:56 +0400
commitaa4927b9edb74f0456d55426bfc44766eae508fe (patch)
treef10c2256b52247f86dcac992feaf76a21e3d52b5 /lib/pm-notifier-error-inject.c
parent418a133b714352c35f050d59857f95f769d552d2 (diff)
parentd65ea48dc61ffdf6cd7f25b4c319bbd68015e018 (diff)
downloadlinux-aa4927b9edb74f0456d55426bfc44766eae508fe.tar.xz
Merge branch 'parisc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "This contains a kernel segfault fix when reading /proc/kpageflags or /proc/kpagecount, two fixes for the serial port and PCI graphic card support on C8000 workstations and a fix to use unshadowed registers for flushing D- and I-caches." * 'parisc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Use unshadowed index register for flush instructions in flush_dcache_page_asm and flush_icache_page_asm parisc: provide pci_mmap_page_range() for parisc parisc: fix serial ports on C8000 workstation parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50 (part 2)
Diffstat (limited to 'lib/pm-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions