Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mesa/main/syncobj.h
	xorg-server/dix/events.c
	xorg-server/dix/getevents.c
	xorg-server/include/misc.h

1 files changed, 1 insertions, 11 deletions

diff --git a/xorg-server/hw/kdrive/src/kinfo.c b/xorg-server/hw/kdrive/src/kinfo.c
index 7055fbf4a..0055b16db 100644
--- a/xorg-server/hw/kdrive/src/kinfo.c
+++ b/xorg-server/hw/kdrive/src/kinfo.c
@@ -134,19 +134,9 @@ KdNewPointer (void)
 void
 KdFreePointer(KdPointerInfo *pi)
 {
-    InputOption *option, *prev = NULL;
-
     free(pi->name);
     free(pi->path);
-
-    for (option = pi->options; option; option = option->next) {
-        free(prev);
-        free(option->key);
-        free(option->value);
-        prev = option;
-    }
-
-    free(prev);
+    input_option_free_list(&pi->options);
     free(pi);
 }