[kernel] snapshot 2.6.38-rc2-git1

[Kyle McMartin]

commit a08b493398ae0e0b635dd426e5f7c0bb28cade6f
Author: Kyle McMartin <kyle at redhat.com>
Date:   Mon Jan 24 10:24:30 2011 -0500

    snapshot 2.6.38-rc2-git1

 kernel.spec                 |   13 +++++++------
 sources                     |    1 +
 tpm-fix-stall-on-boot.patch |   24 ------------------------
 3 files changed, 8 insertions(+), 30 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f2f62d4..711529c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -714,8 +714,6 @@ Patch12017: prevent-runtime-conntrack-changes.patch
 
 Patch12018: neuter_intel_microcode_load.patch
 
-Patch12030: tpm-fix-stall-on-boot.patch
-
 Patch12101: apple_backlight.patch
 Patch12102: efifb_update.patch
 Patch12200: acpi_reboot.patch
@@ -1322,9 +1320,6 @@ ApplyPatch add-appleir-usb-driver.patch
 
 ApplyPatch neuter_intel_microcode_load.patch
 
-# try to fix stalls during boot (#530393)
-ApplyPatch tpm-fix-stall-on-boot.patch
-
 # various fixes for Apple and EFI
 ApplyPatch apple_backlight.patch
 ApplyPatch efifb_update.patch
@@ -1958,6 +1953,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jan 24 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git1.1
+- Linux 2.6.38-rc2-git1
+- [e5cce6c1] tpm: fix panic caused by "tpm: Autodetect itpm devices"
+  may fix some boot issues people were having.
+- tpm-fix-stall-on-boot.patch: upstream.
+
 * Sat Jan 22 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git0.1
 - Linux 2.6.38-rc2
 - linux-2.6-serial-460800.patch, drivers/serial => drivers/tty/serial
diff --git a/sources b/sources
index f2140a0..2c16061 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
 4651b1512e2fba1735713aca8f1007fc  patch-2.6.38-rc2.bz2
+1edbfed39a74c24b542747f2b97f1e32  patch-2.6.38-rc2-git1.bz2