tree 52eef1d14bcf6f6ad6226fca02e8198a30d7abe3
parent 2ee8099f2c2bc74a7c2fac7f83e12a5d651681d3
parent edf03fb0575cbee2595a63374b17dc0921f2094a
author Linus Torvalds <torvalds@g5.osdl.org> 1158972650 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1158972650 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Rework AGPv3 modesetting fallback.
  [AGPGART] Add suspend callback for i965
  [AGPGART] Fix number of aperture sizes in 830 gart structs.
  [AGPGART] Intel 965 Express support.
  [AGPGART] agp.h: constify struct agp_bridge_data::version
  [AGPGART] const'ify VIA AGP PCI table.
  [AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
  [AGPGART] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c
  [AGPGART] Const'ify the agpgart driver version.
  [AGPGART] remove private page protection map