[git pull] revert + dri1 fix

[Keith Packard]

Dave Airlie <airlied at gmail.com> writes:

> ----------------------------------------------------------------
> Dave Airlie (2):
>       dri1: fix dri1 startup since 459c6da0f907ba33d733c7e62a116184ba2f14e5
>       Revert "xf86: Fix non-PCI configuration-less setups"

Merged.
   da3eaf6..d982d87  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121217/b734a22c/attachment-0001.pgp>