From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Jan 2014 01:09:26 +0000 (+0800)
Subject: Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d1c153ab373a5c07feb97eaf4e4bcad5bfc262e;p=linux-beck.git

Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/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
---

7d1c153ab373a5c07feb97eaf4e4bcad5bfc262e