[PULL] #5436 and a misc fix.

[Keith Packard]

On Wed, 10 Nov 2010 21:48:20 -0800, Jesse Adkins <jesserayadkins at gmail.com> wrote:
>
> Jesse Adkins(2):
>  xfree86: parser: Remove 'CUSTOM' flag option in Monitor section.
>  fb: Remove fbcmap.c (bug 5436)

Merged.
   78f94f1..ed547a9  master -> master

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