Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move
authorRandy Dunlap <rdunlap@xenotime.net>
Mon, 7 Nov 2011 05:40:22 +0000 (21:40 -0800)
committerRandy Dunlap <rdunlap@xenotime.net>
Mon, 7 Nov 2011 05:40:22 +0000 (21:40 -0800)
commit5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36
tree806068fd67093b7d653972d2627c4e6f479f25a5
parentb32fc0a0629bf5894b35f33554c118aacfd0d1e2
parentbcd3cfc1213894ff955771508d46fa18d66e9328
Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move
drivers/gpu/drm/i915/i915_drv.c