pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 40b8606 2e532d6)

author	Arjan van de Ven <arjan@linux.intel.com>
	Fri, 17 Oct 2008 16:20:26 +0000 (09:20 -0700)
committer	Arjan van de Ven <arjan@linux.intel.com>
	Fri, 17 Oct 2008 16:20:26 +0000 (09:20 -0700)
commit	651dab4264e4ba0e563f5ff56f748127246e9065
tree	016630974bdcb00fe529b673f96d389e0fd6dc94	tree \| snapshot
parent	40b8606253552109815786e5d4b0de98782d31f5	commit \| diff
parent	2e532d68a2b3e2aa6b19731501222069735c741c	commit \| diff

Merge commit 'linus/master' into merge-linus

Conflicts:

arch/x86/kvm/i8254.c

15 files changed:

arch/ia64/kvm/kvm-ia64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/i8254.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/lapic.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/crypto/ap_bus.c	diff1 \|	diff2 \|	blob \| history
fs/compat.c	diff1 \|	diff2 \|	blob \| history
include/linux/hrtimer.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/time.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	diff1 \|	diff2 \|	blob \| history
kernel/posix-timers.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
kernel/time/ntp.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.