aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 19:38:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 19:38:08 -0700
commita5b617368c8d61072844ac267aaf140e489b808b (patch)
tree2b7699b6bd7d044a0301962d679682f99a0718ab /arch/ia64/include/asm/timex.h
parent03a7ab083e4d619136d6f07ce70fa9de0bc436fc (diff)
parent54ff7e595d763d894104d421b103a89f7becf47c (diff)
downloadkernel_replicant_linux-a5b617368c8d61072844ac267aaf140e489b808b.tar.gz
kernel_replicant_linux-a5b617368c8d61072844ac267aaf140e489b808b.tar.bz2
kernel_replicant_linux-a5b617368c8d61072844ac267aaf140e489b808b.zip
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
Diffstat (limited to 'arch/ia64/include/asm/timex.h')
0 files changed, 0 insertions, 0 deletions