]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eec4b9 7eb8246)
Merge bk://linux-dj.bkbits.net/agpgart
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 30 Jul 2004 12:07:42 +0000 (05:07 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 30 Jul 2004 12:07:42 +0000 (05:07 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/pci_ids.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.