From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 20:22:19 +0000 (-0700)
Subject: Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2300
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d8a97af63222c5cbc7fe63ae19345e74e153e90;p=firefly-linux-kernel-4.4.55.git

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
---

6d8a97af63222c5cbc7fe63ae19345e74e153e90