Merge tag 'please-pull-rusty' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2015 17:58:34 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2015 17:58:34 +0000 (10:58 -0700)
commit8cd9234c64c584432f6992fe944ca9e46ca8ea76
tree9b2ef6326738e7121ce810859f149789f5df518a
parent161f873b89136eb1e69477c847d5a5033239d9ba
parent5eda7861e347ffe927ecde5abd74d7b13ae938fa
Merge tag 'please-pull-rusty' of git://git./linux/kernel/git/aegl/linux

Pull ia64 fix from Tony Luck:
 "Fix some build warnings for ia64 - cpu_callin_map doesn't need to be
  volatile"

* tag 'please-pull-rusty' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: make cpu_callin_map non-volatile.