aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-01-13 16:19:55 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-13 16:19:55 -0800
commitb88182f4903e4745dc155be4874db8becf07d456 (patch)
tree97ebfc39fe41e3456772991d6e989fd287aa364a
parentbeb803649f41c4296489f023f3eb6b58e13220ce (diff)
downloadpatches-b88182f4903e4745dc155be4874db8becf07d456.tar.gz
2.6.33-rc4
-rw-r--r--series2
-rw-r--r--tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch (renamed from tty/serial-core-resume-serial-hardware-with-no_console_suspend.patch)0
-rw-r--r--version2
3 files changed, 2 insertions, 2 deletions
diff --git a/series b/series
index a9651d7fcd3b98..f319c2a8346115 100644
--- a/series
+++ b/series
@@ -14,6 +14,7 @@ gregkh/gkh-version.patch
# TTY patches for 2.6.33
#################################
tty.current/serial-imx-bit-confusion.patch
+tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch
#################################
# USB patches for 2.6.33
@@ -45,7 +46,6 @@ driver-core/sysdev-convert-cpu-driver-sysdev-class-attributes.patch
#####################################
# TTY patches for after 2.6.33 is out
#####################################
-tty/serial-core-resume-serial-hardware-with-no_console_suspend.patch
tty/serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.patch
tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch
tty/serial-68328serial.c-remove-baud_table_size-macro.patch
diff --git a/tty/serial-core-resume-serial-hardware-with-no_console_suspend.patch b/tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch
index d5c691a63616b5..d5c691a63616b5 100644
--- a/tty/serial-core-resume-serial-hardware-with-no_console_suspend.patch
+++ b/tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch
diff --git a/version b/version
index a8a49b23859906..44a1056c6e9429 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.33-rc3
+2.6.33-rc4