merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 904-ls_time_locale.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
index 3b419c3..8fc9381 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/gen_initramfs_list.sh        2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/gen_initramfs_list.sh     2007-09-21 16:24:11.000000000 +0800
-@@ -125,7 +125,7 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -125,7 +125,7 @@ parse() {
                        str="${ftype} ${name} ${location} ${str}"
                        ;;
                "nod")
@@ -11,7 +9,7 @@ Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
                        local maj=`field 5 ${dev}`
                        local min=`field 6 ${dev}`
                        maj=${maj%,}
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ parse() {
                        str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
                        ;;
                "slink")