Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next
authorDave Airlie <airlied@linux.ie>
Wed, 5 Aug 2009 00:16:57 +0000 (10:16 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 5 Aug 2009 00:16:57 +0000 (10:16 +1000)
1  2 
drivers/char/agp/parisc-agp.c

Simple merge