Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2013 20:45:49 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2013 20:45:49 +0000 (13:45 -0700)
commitd3f72cfb7aa2c92debecacddf65fdef582f238a3
treeeccea723463e8521a16c52bc8f4c3f448f2a9083
parent5e248509b67f82102b9bfbf43d6efa04ba8252aa
parentd17cfb34dc5eb527b98448f3999aac52311d438b
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 fix from Catalin Marinas:
 "Fix IS_ENABLED() usage typo (missing CONFIG_ prefix)."

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  ARM64: early_printk: Fix check for CONFIG_ARM64_64K_PAGES