]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jan 2014 01:09:26 +0000 (09:09 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jan 2014 01:09:26 +0000 (09:09 +0800)
Pull parisc fix from Helge Deller:
 "This patch fixes the kmap/kunmap implementation on parisc and finally
  makes AIO work on parisc"

* 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Ensure full cache coherency for kmap/kunmap


Trivial merge