git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7250b8 adee14b)
Merge commit 'v2.6.27-rc6' into timers/hpet
authorIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 16:24:00 +0000 (18:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 16:24:00 +0000 (18:24 +0200)
1  2 
Documentation/00-INDEX patch | diff1 | diff2 | blob | history
arch/x86/kernel/hpet.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/00-INDEX
Simple merge
diff --cc arch/x86/kernel/hpet.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.