From: Linus Torvalds Date: Tue, 10 Jan 2012 18:09:48 +0000 (-0800) Subject: Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne... X-Git-Tag: firefly_0821_release~3680^2~3782 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae5cfc0546ca2698b9dcddf72accbd70e57590a0;p=firefly-linux-kernel-4.4.55.git 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. --- ae5cfc0546ca2698b9dcddf72accbd70e57590a0