From: Linus Torvalds Date: Thu, 21 Oct 2010 20:47:54 +0000 (-0700) Subject: Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87affd0b9416d8f43d2d4de1f3fdfbe7f3559380;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'x86-mrst-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: sfi: Make local functions static x86, earlyprintk: Add hsu early console for Intel Medfield platform x86, earlyprintk: Add earlyprintk for Intel Moorestown platform x86: Add two helper macros for fixed address mapping x86, mrst: A function in a header file needs to be marked "inline" --- 87affd0b9416d8f43d2d4de1f3fdfbe7f3559380