Merge branch 'drm-intel-fixes' into drm-intel-next
Chris Wilson [Tue, 14 Dec 2010 11:34:51 +0000 (11:34 +0000)]
1  2 
drivers/char/agp/intel-gtt.c

Simple merge