Merge commit 'linus/master' into merge-linus
commit651dab4264e4ba0e563f5ff56f748127246e9065
authorArjan van de Ven <arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000 (17 09:20 -0700)
committerArjan van de Ven <arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000 (17 09:20 -0700)
tree016630974bdcb00fe529b673f96d389e0fd6dc94
parent40b8606253552109815786e5d4b0de98782d31f5
parent2e532d68a2b3e2aa6b19731501222069735c741c
Merge commit 'linus/master' into merge-linus

Conflicts:

arch/x86/kvm/i8254.c
15 files changed:
arch/ia64/kvm/kvm-ia64.c
arch/x86/kvm/i8254.c
arch/x86/kvm/lapic.c
drivers/s390/crypto/ap_bus.c
fs/compat.c
include/linux/hrtimer.h
include/linux/sched.h
include/linux/time.h
kernel/fork.c
kernel/hrtimer.c
kernel/posix-timers.c
kernel/sched.c
kernel/sys.c
kernel/time/ntp.c
kernel/time/tick-sched.c