merge by hand (fix up qla_os.c merge error)
[linux-2.6] / include / asm-ppc64 / agp.h
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-06-09  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-06-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-08  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-arm
2005-06-07  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/davej/agpgart
2005-06-07  Keir Fraser[PATCH] AGP fix for Xen VMM
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2