Merge remote-tracking branch 'armlt/3.3-armlt-gator-5.10' into stable-linux-ux500-3.3ubuntu-release-12-07ubuntu-release-12-06

Conflicts:
	drivers/Kconfig

1 files changed, 25 insertions, 0 deletions

diff --git a/tools/gator/daemon/CapturedXML.h b/tools/gator/daemon/CapturedXML.h
new file mode 100644
index 00000000000..984d1f2d13e
--- /dev/null
+++ b/tools/gator/daemon/CapturedXML.h
@@ -0,0 +1,25 @@
+/**
+
+ * Copyright (C) ARM Limited 2010-2012. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef	__CAPTURED_XML_H__
+#define	__CAPTURED_XML_H__
+
+#include "mxml/mxml.h"
+
+class CapturedXML {
+public:
+	CapturedXML();
+	~CapturedXML();
+	char* getXML(); // the string should be freed by the caller
+	void write(char* path);
+private:
+	mxml_node_t* getTree();
+};
+
+#endif 	//__CAPTURED_XML_H__