Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jul 2012 20:22:19 +0000 (13:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jul 2012 20:22:19 +0000 (13:22 -0700)
commit6d8a97af63222c5cbc7fe63ae19345e74e153e90
tree4b3e286c1f68bece1e839ae63f5c659711cae47d
parentf6bcfc9dd48d305211283b7f7d55e3779a2f661b
parenta119365586b0130dfea06457f584953e0ff6481d
Merge tag 'please-pull-ia64-fixes' of git://git./linux/kernel/git/aegl/linux

Pull misc ia64 build fixes from Tony Luck.

* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
  [IA64] Rename platform_name to ia64_platform_name
  [IA64] Mark PARAVIRT and KVM as broken
arch/ia64/kvm/Kconfig