projects / platform / kernel / linux-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aafade2 02f8c6a)
Merge commit 'v3.0' into x86/vdso
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
drivers/char/hpet.c patch | diff1 | diff2 | blob | history
include/linux/clocksource.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
diff --cc drivers/char/hpet.c
Simple merge
diff --cc include/linux/clocksource.h
Simple merge
Domain: System / Kernel;