From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Mar 2010 14:22:38 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~24243
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca