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

diff --cc drivers/char/agp/ali-agp.c
Simple merge

diff --cc drivers/char/agp/amd64-agp.c
Simple merge

diff --cc drivers/char/agp/ati-agp.c
Simple merge

diff --cc drivers/char/agp/i460-agp.c
Simple merge

diff --cc drivers/char/agp/sgi-agp.c
Simple merge

diff --cc drivers/char/agp/sworks-agp.c
Simple merge