]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.bak.git/.git/commitdiff
projects / people / ssmith / netchannel2-pvops.bak.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39ea061 6a94cb7)
Merge branch 'linus' into warnings/bug
authorIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 06:57:34 +0000 (07:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 06:57:34 +0000 (07:57 +0100)
1  2 
block/cfq-iosched.c patch | diff1 | diff2 | blob | history
include/asm-generic/bug.h patch | diff1 | diff2 | blob | history

diff --cc block/cfq-iosched.c
Simple merge
diff --cc include/asm-generic/bug.h
Simple merge
Unnamed repository; edit this file to name it for gitweb.