]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'metag-fixes-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Mar 2015 23:52:53 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Mar 2015 23:52:53 +0000 (16:52 -0700)
commit4c4fe4c24782bf5bc533b3df34599301ec31b605
treeb93d4ae21f2f218c8ec4cfffa477637b285e3de9
parent9c8e30d12d46461c283608d3123debc4e75d4f8b
parent0164a711c97b0beeb7994b7d32ccddf586b6d81a
Merge tag 'metag-fixes-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull arch/metag fix from James Hogan:
 "Another metag architecture fix for v4.0

  This is another single fix, for an include dependency problem when
  using ioremap_wc() from asm/io.h without also including asm/pgtable.h"

* tag 'metag-fixes-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Fix ioremap_wc/ioremap_cached build errors