merge xorg-server 21.1.16.

merge xorg-serer 21.1.3.

merge xorg-server 1.20.3.

Add explicit cast before writing to newly allocated memory.

XXX Beside the strange allocation size, this could be XNFstrdup.

check for __arm__ as well as __arm32__.

first merge of netbsd changes. not tested yet.

When configuring a new PCI or SBus device, remember to stash the bus
specific information (in pVideo for PCI or sVideo for SBus), otherwise
more than one driver may try to attach to the device and 'X -configure'
will fail with "Number of created screens does not match number of
detected devices".

merge cornflakes with xorg-server 1.10.3

put back a little bit of BUS_ISA, enough for shark and chips driver.

merge xorg-server 1.9.2.

let xf86AddBusDeviceToConfigure() accept BUS_ISA and BUS_NONE

when writing PCI BusIDs include the domain ID if it's non-zero
While there also add
Option "Protocol" "wskbd"
Option "Device" "/dev/wskbd"
to the keyboard section on non-x86
Now X -configure should dump something more usable.

initial import of xorg-server-1.6.1.901

initial import of xorg-server-1.4.2