| commit | 87affd0b9416d8f43d2d4de1f3fdfbe7f3559380 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:47:54 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:47:54 2010 -0700 |
| tree | 0da5dbe780fbd0e9f0050e3773d58da8cf1ecce1 | |
| parent | c3b86a29429dac1033e3f602f51fa8d00006a8eb [diff] | |
| parent | 940b3c7b193ec54141976a8642c00582f423690c [diff] |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/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"