From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Mar 2015 23:52:53 +0000 (-0700)
Subject: Merge tag 'metag-fixes-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga... 
X-Git-Tag: Ubuntu-5.13.0-19.19~18279
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4c4fe4c24782bf5bc533b3df34599301ec31b605;p=mirror_ubuntu-jammy-kernel.git

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
---

4c4fe4c24782bf5bc533b3df34599301ec31b605