From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Mar 2013 20:45:49 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Tag: v3.9-rc5~19
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=d3f72cfb7aa2c92debecacddf65fdef582f238a3;p=karo-tx-linux.git

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/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
---

d3f72cfb7aa2c92debecacddf65fdef582f238a3