Merge branch 'master' of https://vcs.maemo.org/git/kernel-power

Conflicts:
	kernel-power-2.6.28/debian/changelog
	kernel-power-2.6.28/debian/patches/series

diff --cc kernel-power-2.6.28/debian/changelog
index 96d5ccb,eb3cb2d..8f50b22
--- 1/kernel-power-2.6.28/debian/changelog
--- 2/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@@ -1,21 -1,23 +1,35 @@@
- kernel-power (2.6.28-maemo39.bfs0) fremantle; urgency=low
++kernel-power (2.6.28-maemo40.bfs0) fremantle; urgency=low
 +
-   * BFS version of 2.6.28-maemo39
++  * BFS version of 2.6.28-maemo40
 +
 + -- Corey O'Connor <coreyoconnor@gmail.com>  Tue,  04 Aug 2010 16:50:00 +0800
 +
+ kernel-power (2.6.28-maemo40) fremantle; urgency=low
+ 
+   * install build scripts properly in /usr/src/kernel-power-kbuild
+ 
+  -- Thomas Tanner <maemo@tannerlab.com>  Mon,  9 Aug 2010 23:17:47 +0200
+ 
+ kernel-power (2.6.28-maemo39) fremantle; urgency=low
+ 
+   * new kernel-power-bootimg package for the kernel zImage
+ 
+  -- Thomas Tanner <maemo@tannerlab.com>  Tue,  3 Aug 2010 22:25:38 +0200
+ 
 +kernel-power (2.6.28-maemo38.bfs) fremantle; urgency=low
 +
 +  * Apply BFS patches
 +
 + -- Corey O'Connor <coreyoconnor@gmail.com>  Tue,  10 Jul 2010 16:50:00 +0800
 +
  kernel-power (2.6.28-maemo38) fremantle; urgency=low
  
+   * add missing linux headers to kernel-power-headers
    * enable netfiler tcpmss+mac
    * increase kernel log buffer to 64K
+   * add ARM thumb2 fix
  
-  -- Thomas Tanner <maemo@tannerlab.com>  Tue,  1 Jun 2010 09:25:38 +0200
+  -- Thomas Tanner <maemo@tannerlab.com>  Tue,  3 Aug 2010 09:25:38 +0200
  
  kernel-power (2.6.28-maemo37) fremantle; urgency=low
  

diff --cc kernel-power-2.6.28/debian/patches/series
index 538fab6,ae98527..ba34304
--- 1/kernel-power-2.6.28/debian/patches/series
--- 2/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@@ -30,9 -30,4 +30,8 @@@ overclock.dif
  #bq24150-sniff.diff
  #usbhost4.diff
  #usbhostmode.diff
 +bfs.patch
 +voltage_scaling_1.diff
 +voltage_scaling_0.diff
  armthumb.diff
- issue_12309_0.diff
- 
++#issue_12309_0.diff