+++ /dev/null
-From foo@baz Sun Feb 12 23:09:28 PST 2012
-Date: Sun, 12 Feb 2012 23:09:28 -0800
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: LTSI Makefile addition
-
-Change the extra version to have -ltsi to have a chance to realize what
-kernel version we are using.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 3
- PATCHLEVEL = 0
- SUBLEVEL = 20
--EXTRAVERSION =
-+EXTRAVERSION = -ltsi
- NAME = Sneaky Weasel
-
- # *DOCUMENTATION*
--- /dev/null
+From foo@baz Sun Feb 12 23:09:28 PST 2012
+Date: Sun, 12 Feb 2012 23:09:28 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: LTSI Makefile addition
+
+Change the extra version to have -ltsi to have a chance to realize what
+kernel version we are using.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 3
+ PATCHLEVEL = 0
+ SUBLEVEL = 20
+-EXTRAVERSION =
++EXTRAVERSION = -ltsi
+ NAME = Sneaky Weasel
+
+ # *DOCUMENTATION*
# LTSI patch queue series
#
+#
+# LTSI project specific patches
+#
-ltsi-makefile-addition.patch
+patches.ltsi/ltsi-makefile-addition.patch
-#
+#############################################################################
# Android patches.
#
+# Upstream patches
# 3.2.0 through 3.3-rc3
patches.android/android-0001-Revert-Staging-android-delete-android-drivers.patch
patches.android/android-0002-staging-android-fix-build-issues.patch
patches.android/staging-android-add-the-code-back-to-the-build.patch
-#
+# non-upstream patches
+
+
+
+#############################################################################
# LTTNG
# Patches came from short-lived experiment when they were added to the staging
# tree for a week or so.