Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2010 14:22:38 +0000 (07:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2010 14:22:38 +0000 (07:22 -0700)
commitbe3fd3cc7c2142c46d5dcfec05e6031990d1f2ca
tree606074b5c60ef823ad86174e408904c563eab38d
parent9623e5a23724d09283c238960946ec6f65733afe
parenteed63519e3e74d515d2007ecd895338d0ba2a85c
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: Do not free zero sized per cpu areas
  x86: Make sure free_init_pages() frees pages on page boundary
  x86: Make smp_locks end with page alignment