]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cfea5d e103650)
Merge ../linus
authorDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
committerDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
1  2 
drivers/char/agp/Kconfig patch | diff1 | diff2 | blob | history
drivers/char/agp/generic.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/agp/Kconfig
Simple merge
diff --cc drivers/char/agp/generic.c
Simple merge
Clone of davem's net-next-2.6 tree