Merge remote-tracking branch 'whot/unreviewed'
authorKeith Packard <keithp@keithp.com>
Fri, 24 May 2013 01:58:46 +0000 (19:58 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 24 May 2013 01:58:46 +0000 (19:58 -0600)
1  2 
dix/devices.c

diff --cc dix/devices.c
Simple merge