Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
commitcd86a536c81e9300d984327517548ca0652eebf9
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 22:06:12 +0000 (26 15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 22:06:12 +0000 (26 15:06 -0700)
treea9c197a9f9bb4f615b0fe19134f40ccc77ff8dd8
parentebd4c994d2f917dffec882e7a77c28c6b28758ac
parent2171787be2e71ff71159857bfeb21398b61eb615
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: avoid back to back on_each_cpu in cpa_flush_array
  x86, relocs: ignore R_386_NONE in kernel relocation entries