aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-15 15:23:59 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-15 15:23:59 -0800
commit5fd85c73416b597000aa6bd3d8afb12e755493dc (patch)
tree99a1d82cf10047b56d764184fa3c09873106a30b
parent59df93cda0a3c786554b3598abdf320c42035986 (diff)
downloadltsi-kernel-5fd85c73416b597000aa6bd3d8afb12e755493dc.tar.gz
update to 3.4.31
-rw-r--r--KERNEL_VERSION2
-rw-r--r--patches.ltsi/ltsi-makefile-addition.patch2
-rw-r--r--series2
3 files changed, 4 insertions, 2 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index f25e7352c44e88..51335e1c81bdcd 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.4.30
+3.4.31
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index d00b6e1943aa93..e57a5a27aeea6b 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 4
- SUBLEVEL = 30
+ SUBLEVEL = 31
-EXTRAVERSION =
+EXTRAVERSION = -ltsi
NAME = Saber-toothed Squirrel
diff --git a/series b/series
index 8b81fb040ba61f..998032a714e60c 100644
--- a/series
+++ b/series
@@ -781,3 +781,5 @@ patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch
patches.fixes/0001-ASoC-fsi-fixup-channels_min-max.patch
patches.fixes/0002-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch
patches.fixes/0003-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe.patch
+patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch
+patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch