| commit | 12fcdba1b7ae8b25696433f420b775aeb556d89b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 19 20:27:25 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 19 20:27:25 2011 -0800 |
| tree | 2826a8e5ebce9296ae8a53f2eb35c49946aadeee | |
| parent | 1268afe676ee9431a229fc68a2efb0dad4d5852f [diff] | |
| parent | 9032160275ba018003ff390835ff8ed2b5b788b8 [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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: Unify "numa=" command line option handling Revert "x86: Make relocatable kernel work with new binutils"