LINARO: Linux-linaro-2.6.38-1001.2Linaro-2.6.38-1001.2

Signed-off-by: John Rigby <john.rigby@linaro.org>

1 files changed, 24 insertions, 17 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 4dfb6d8fefbf..90018a00c554 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -1,19 +1,18 @@
-linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low
+linux-linaro (2.6.38-1001.2) natty; urgency=low
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  [ John Rigby ]
 
-  * Rebase to new upstreams: 
+  * Rebase to new upstreams:
     Linux v2.6.38-rc6 -- same
     linaro-linux-2.6.38-upstream-1Mar2011 -- new
     Ubuntu-2.6.38-5.32 -- same
+    - LP: #724377
   * Enable CONFIG_THUMB2_KERNEL for OMAP[34]
   * Bump ABI
-  * Rebase to new upstreams: 
+  * Rebase to new upstreams:
     Linux v2.6.38-rc7
     linaro-linux-2.6.38-upstream-4Mar2011
-    ubuntu-natty master-next as of 4Mar2011 
+    ubuntu-natty master-next as of 4Mar2011
   * Re-enable display on OMAP4
   * Disable CONFIG_OMAP2_DSS_SDI
     - LP: #728603
@@ -22,28 +21,36 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low
     Linux v2.6.38-rc8
     linaro-linux-2.6.38-upstream-9Mar2011
       rebased to 2.6.38-rc8
-  * Remove generated file kernel-versions and sort kerne-versions.in
+  * Remove generated file kernel-versions and sort kernel-versions.in
   * Enable CONFIG_TIMER_STATS
     - LP: #718677
-  * Rebase to new upstreams: 
+  * Rebase to new upstreams:
     Linux v2.6.38 final
     linaro-linux-2.6.38-upstream-16Mar2011
     - LP: #708883
     - LP: #723159
     ubuntu-natty Ubuntu-2.6.38-7.35
+  * Enable CONFIG_IP_PNP and CONFIG_ROOT_NFS for all flavours
+    - LP: #736429
+  * mach-ux500: fix build error
+    workaround a problem in linux-linaro-2.6.38
+  * OMAP4:Fix -EINVAL for vana, vcxio, vdac
+    from omap-linux mailing list pending ack
+  * turn off ROOT_NFS for mx51
+    it makes the kernel too large to boot with current hwpack settings
 
- -- John Rigby <john.rigby@linaro.org>  Wed, 16 Mar 2011 16:11:06 -0600
+ -- John Rigby <john.rigby@linaro.org>  Fri, 18 Mar 2011 07:36:33 -0600
 
 linux-linaro (2.6.38-1000.1) natty; urgency=low
 
-  * Rebase to new upstreams: 
+  * Rebase to new upstreams:
     Linux v2.6.38-rc5
     linaro-linux-2.6.38-upstream-22Feb2011
     Ubuntu-2.6.38-4.31
   * Enforce CONFIG_PM_ADVANCED_DEBUG for all flavours
     - LP: #713075
   * Temporarily disable display on OMAP4
-  * Rebase to new upstreams: 
+  * Rebase to new upstreams:
     Linux v2.6.38-rc6
     linaro-linux-2.6.38-upstream-23Feb2011
     Ubuntu-2.6.38-5.32
@@ -88,7 +95,7 @@ linux-linaro (2.6.37-1002.5) natty; urgency=low
 
   [ John Rigby ]
 
-  * rebase to new upstreams: 
+  * rebase to new upstreams:
     v2.6.37 final
     Ubuntu-2.6.37-12.26
   * Clean up lintian errors and warnings
@@ -430,15 +437,15 @@ linux-linaro (2.6.35-1002.6) maverick; urgency=low
 linux-linaro (2.6.35-1001.5) maverick; urgency=low
 
   * New upstream trees
-    
+
     Merge of linaro_merge_100811 and Ubuntu-2.6.35-15.21
-    
+
     Conflicts:
         arch/arm/mach-omap2/board-4430sdp.c
-    
+
             linaro_merge_100811 added sdp4430_leds_gpio to sdp4030_devices
             Ubuntu 2.6.35-15.21 added sdp4430_nop_usb_device to sdp4030_devices
-    
+
             resolution was to just add both
 
   * Fold in packaging from 2.6.35-1000.4