git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e93fe85 c97dc9b)
Merge commit 'local_master/master'
authorroot <root@cassidy.cs.princeton.edu>
Tue, 5 Oct 2010 08:43:18 +0000 (04:43 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Tue, 5 Oct 2010 08:43:18 +0000 (04:43 -0400)
1  2 
kernel-2.6.spec patch | diff1 | diff2 | blob | history

diff --cc kernel-2.6.spec
Simple merge
linux-2.6