Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel...
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 15 Jan 2015 15:44:44 +0000 (15:44 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 15 Jan 2015 15:44:44 +0000 (15:44 +0000)
commit0ce339a9e60d417e2747ff7c4869d9691a606e49
tree5b86390afa1ff86706b2c2cba9e3953f1e412e45
parent5d425c18653731af62831d30a4fa023d532657a9
parent056bb5f51c357ee00046fde4929a03468ff45e7a
Merge branch 'arm64/common-esr-macros' of git://git./linux/kernel/git/mark/linux

ESR_ELx definitions clean-up from Mark Rutland.

* 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
  arm64: kvm: decode ESR_ELx.EC when reporting exceptions
  arm64: kvm: remove ESR_EL2_* macros
  arm64: remove ESR_EL1_* macros
  arm64: kvm: move to ESR_ELx macros
  arm64: decode ESR_ELx.EC when reporting exceptions
  arm64: move to ESR_ELx macros
  arm64: introduce common ESR_ELx_* definitions