]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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


Trivial merge