=== modified file 'debian/changelog'
--- debian/changelog	2010-09-15 13:43:46 +0000
+++ debian/changelog	2010-11-26 12:24:22 +0000
@@ -1,3 +1,20 @@
+powertop (1.13-1.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #), remaining changes:
+    - Cherrypick upstream patch 0a8620213f1841a to stop hardcoding the maximum
+      number of C and P states. This makes powertop work on ARM processors as
+      well, which have a lot of those states. Thanks to Amit Arora for the
+      patch! (LP: #627975)
+
+ -- Jesper Larsen <knorr@es.aau.dk>  Fri, 26 Nov 2010 13:22:55 +0100
+
+powertop (1.13-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add missing include to fix FTBFS on ia64 and alpha (Closes: #570662)
+
+ -- Serafeim Zanikolas <sez@debian.org>  Fri, 15 Oct 2010 00:07:37 +0200
+
 powertop (1.13-1ubuntu1) maverick; urgency=low
 
   * Cherrypick upstream patch 0a8620213f1841a to stop hardcoding the maximum

=== modified file 'perf.c'
--- perf.c	2010-07-29 11:32:48 +0000
+++ perf.c	2010-11-26 12:21:47 +0000
@@ -36,13 +36,16 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
+#if defined(__ia64__) || defined(__alpha__)
+#include <asm-generic/unistd.h>
+#endif
+
 #include <fcntl.h>
 
 #include "perf_event.h"
 
 #include "powertop.h"
 
-
 /* some people have stale headers */
 #ifndef __NR_perf_event_open
 #ifdef __i386__