Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 18:09:48 +0000 (10:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 18:09:48 +0000 (10:09 -0800)
commitae5cfc0546ca2698b9dcddf72accbd70e57590a0
treeeb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b
parent3dcf6c1b6b29f327ec24a1986aaa8eba399b463f
parentdc6821e0cfe74802aefd2067b40fcdc03fc4599e
Merge branch 'stable/for-linus-fixes-3.3' of git://git./linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/mmu: Fix compile errors introduced by x86/memblock mismerge.