]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6bcfc9 a119365)
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)
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

1  2 
arch/ia64/kvm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/kvm/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.