]> git.hungrycats.org Git - linux/commit
Merge hardwired.(none):/mnt/stuff/backups/src/kernel/2.6/trees/bk-linus
authorDave Jones <davej@hardwired.(none)>
Fri, 12 Sep 2003 01:33:27 +0000 (02:33 +0100)
committerDave Jones <davej@hardwired.(none)>
Fri, 12 Sep 2003 01:33:27 +0000 (02:33 +0100)
commita0cad19d455c15e9d1c53fdace5109cd89a6df80
treed4d1e68a1b0886f4775a05849781bb3505c2fc02
parentcd36c392271a7775abf6be5f049d31434d37c798
parentf22c3713cb3bdcf9d3d08ad3e2b460969083b90b
Merge hardwired.(none):/mnt/stuff/backups/src/kernel/2.6/trees/bk-linus
into hardwired.(none):/mnt/stuff/backups/src/kernel/2.6/trees/agpgart
arch/x86_64/kernel/pci-gart.c
drivers/char/agp/ati-agp.c