From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Jul 2014 17:12:52 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v3.16-rc4~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e1a08b855f56d6528e7f85aae9ca8123f4c3ae04;p=~emulex%2Finfiniband.git

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull ARM64 fixes from Catalin Marinas:
 - Exception level check at boot time (for completeness, not triggering
   any bug before)
 - I/D-cache synchronisation logic for huge pages
 - Config symbol typo

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix el2_setup check of CurrentEL
  arm64: mm: Make icache synchronisation logic huge page aware
  arm64: mm: Fix horrendous config typo
---

e1a08b855f56d6528e7f85aae9ca8123f4c3ae04