commit | a5b617368c8d61072844ac267aaf140e489b808b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 16 19:38:08 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 16 19:38:08 2010 -0700 |
tree | 2b7699b6bd7d044a0301962d679682f99a0718ab | |
parent | 03a7ab083e4d619136d6f07ce70fa9de0bc436fc [diff] | |
parent | 54ff7e595d763d894104d421b103a89f7becf47c [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: hpet: Work around hardware stupidity x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y x86, cpufeature: Suppress compiler warning with gcc 3.x x86, UV: Fix initialization of max_pnode