Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jan 2014 00:33:27 +0000 (11:33 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jan 2014 00:33:27 +0000 (11:33 +1100)
commit8b6d79f5b8eccf81688115a7e724fd6e096156d5
tree44c04a613fbb5a1b83d7f086b6ea1ee46d0a88ca
parentd1969a84dd6a44d375aa82bba7d6c38713a429c3
parent4ce00dfcf19c473f3dbf23d5b1372639f0c334f6
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fix from Catalin Marinas:
 "Revert "arm64: Fix memory shareability attribute for ioremap_wc/cache"

  We noticed that it breaks ioremap (and earlyprintk) with 64K page
  configuration"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  Revert "arm64: Fix memory shareability attribute for ioremap_wc/cache"