Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 01:35:53 +0000 (18:35 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 01:35:53 +0000 (18:35 -0700)
commit08f3dfe8c4b91189890019d307aad236c3633515
tree691ce0fa81741913df3b25ba35b040858ab8d5e5
parent0127d6d5d925321650e7b92364420325689a03ef
parent8888985144db8f4cb7e56154b31bdf233d3550bf
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: fix device probe