summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/time.h
diff options
context:
space:
mode:
authorIngo Molnar2008-10-06 16:17:23 +0200
committerIngo Molnar2008-10-06 16:17:23 +0200
commit19268ed7449c561694d048a34601a30e2d1aaf79 (patch)
tree6f3f28ddac5d2b1cecd0f18ccf283f076839532a /include/asm-x86/time.h
parentMerge branch 'x86/header-guards' into x86-v28-for-linus-phase1 (diff)
parentx86: ds.c ptrace.c integer as NULL pointer sparse fixes (diff)
downloadkernel-qcow2-linux-19268ed7449c561694d048a34601a30e2d1aaf79.tar.gz
kernel-qcow2-linux-19268ed7449c561694d048a34601a30e2d1aaf79.tar.xz
kernel-qcow2-linux-19268ed7449c561694d048a34601a30e2d1aaf79.zip
Merge branch 'x86/pebs' into x86-v28-for-linus-phase1
Conflicts: include/asm-x86/ds.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/time.h')
0 files changed, 0 insertions, 0 deletions