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)
commit7d1c153ab373a5c07feb97eaf4e4bcad5bfc262e
tree6d27d6c7e5f50ae99585f091f1110890d38aa147
parentf8829150d884cddd40deee0f95395317e0109d39
parentf8dae00684d678afa13041ef170cecfd1297ed40
Merge branch 'parisc-3.13' of git://git./linux/kernel/git/deller/parisc-linux

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