st/xorg: fix merge droppings
authorKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 14:54:32 +0000 (14:54 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 14:54:32 +0000 (14:54 +0000)
commitb7f94c9002bd8578e89ce02a22172545ace353a3
treed4df544d04e4c6b2b55586d5b1539dcd63a489b1
parent87eec80c1120d2cd9749ee360b77922feabf7f10
st/xorg: fix merge droppings

These were stranded in emacs and not saved before committing.
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c