Merge branch 'master' into mpx

Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c

include/inputstr.h

@@ -393,6 +393,7 @@ typedef struct _DeviceIntRec {
 #else
     void                *pad0;
 #endif
+    char                *config_info; /* used by the hotplug layer */
     DevUnion		*devPrivates;
     int			nPrivates;
     DeviceUnwrapProc    unwrapProc;