]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0638dec eb35cf6)
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (20:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (20:29 -0400)
1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
Linux kernel for KaRo TX COM modules