aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Kucheria <amit.kucheria@linaro.org>2011-01-17 17:31:50 +0200
committerAmit Kucheria <amit.kucheria@linaro.org>2011-01-17 17:31:50 +0200
commite8587a50a6578d4b1404d82038f6edded7e4f166 (patch)
tree2e8464d6d83e70443870bd54666e9e281ee3c27d
parent1b7bb751f7bbf5ef3e618f986cc030414cccbaa6 (diff)
parenteea3487a091c190658542bce0b623f9a1a3f5a2e (diff)
downloadpowerdebug-e8587a50a6578d4b1404d82038f6edded7e4f166.tar.gz
Merge branch 'master' into debian
-rw-r--r--clocks.c3
-rw-r--r--clocks.h3
-rw-r--r--display.c3
-rw-r--r--display.h3
-rw-r--r--powerdebug.c3
-rw-r--r--powerdebug.h5
-rw-r--r--regulator.c3
-rw-r--r--regulator.h3
-rw-r--r--sensor.c3
-rw-r--r--sensor.h3
10 files changed, 11 insertions, 21 deletions
diff --git a/clocks.c b/clocks.c
index b778dd5..9a76c19 100644
--- a/clocks.c
+++ b/clocks.c
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/clocks.h b/clocks.h
index b893efc..e2be430 100644
--- a/clocks.h
+++ b/clocks.h
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/display.c b/display.c
index 08bbbb9..d3ec421 100644
--- a/display.c
+++ b/display.c
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/display.h b/display.h
index c35bd44..f00a4f8 100644
--- a/display.h
+++ b/display.h
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/powerdebug.c b/powerdebug.c
index 871b947..3f4d60c 100644
--- a/powerdebug.c
+++ b/powerdebug.c
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/powerdebug.h b/powerdebug.h
index 67e8453..f7fdc21 100644
--- a/powerdebug.h
+++ b/powerdebug.h
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
@@ -23,7 +22,7 @@
#include <errno.h>
#include <ncurses.h>
-#define VERSION "0.3"
+#define VERSION "0.4"
#define TOTAL_FEATURE_WINS 3 /* Regulator, Clock and Sensor (for now) */
enum {CLOCK, REGULATOR, SENSOR};
diff --git a/regulator.c b/regulator.c
index bc3554f..18c9777 100644
--- a/regulator.c
+++ b/regulator.c
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/regulator.h b/regulator.h
index 91e01d8..4276933 100644
--- a/regulator.h
+++ b/regulator.h
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/sensor.c b/sensor.c
index 9b2d444..f5fcd40 100644
--- a/sensor.c
+++ b/sensor.c
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*
diff --git a/sensor.h b/sensor.h
index a7535cc..cca11d1 100644
--- a/sensor.h
+++ b/sensor.h
@@ -1,6 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Linaro
- * Copyright (C) 2010, IBM Corporation
+ * Copyright (C) 2010, Linaro Limited.
*
* This file is part of PowerDebug.
*