summaryrefslogtreecommitdiffstats
path: root/drivers/nubus
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-10-20 10:21:33 +0200
committerDave Airlie <airlied@linux.ie>2005-10-20 10:21:33 +0200
commit312f5726055534be1dc9dd369be13aabd2943fcb (patch)
tree29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/nubus
parentdrm: fix drm PCIGART (diff)
parentLinux v2.6.14-rc5 (diff)
downloadlinux-312f5726055534be1dc9dd369be13aabd2943fcb.tar.xz
linux-312f5726055534be1dc9dd369be13aabd2943fcb.zip
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/nubus')
0 files changed, 0 insertions, 0 deletions