]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53e36ad 53a5fbd)
Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 08:59:46 +0000 (04:59 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 08:59:46 +0000 (04:59 -0400)
1  2 
drivers/ata/sata_promise.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ata/sata_promise.c
Simple merge
Linux 2.6 source tree