summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-04-20 22:14:41 -0400
committerDave Jones <davej@redhat.com>2011-04-20 22:14:41 -0400
commit123939a217ba4992b1e79eb74d46ed111b5910e7 (patch)
tree95b84f1e87efe34b838df36e258000aba0069b2e
parent0e465b7a3f2f450907047b3fb673b0c5a95ceaa7 (diff)
downloadkernel-123939a217ba4992b1e79eb74d46ed111b5910e7.tar.gz
kernel-123939a217ba4992b1e79eb74d46ed111b5910e7.tar.xz
kernel-123939a217ba4992b1e79eb74d46ed111b5910e7.zip
2.6.39rc4-git2
-rw-r--r--.gitignore3
-rw-r--r--config-arm2
-rw-r--r--kernel.spec5
-rw-r--r--sources4
4 files changed, 9 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 9f4ab9cf1..203a5c4cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
-patch-2.6.39-rc3.bz2
+patch-2.6.39-rc4.bz2
+patch-2.6.39-rc4-git2.bz2
diff --git a/config-arm b/config-arm
index d42ad71a4..3095ce40e 100644
--- a/config-arm
+++ b/config-arm
@@ -83,7 +83,7 @@ CONFIG_FB_ARMCLCD=m
CONFIG_SND_ARM=y
CONFIG_SND_ARMAACI=m
-CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HDRC=y
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_TUSB6010=y
# CONFIG_USB_MUSB_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index a8cb14b15..0a717df57 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,7 +82,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
# The git snapshot level
%define gitrev 2
# Set rpm version accordingly
@@ -1941,6 +1941,9 @@ fi
# and build.
%changelog
+* Wed Apr 20 2011 Dave Jones <davej@redhat.com> 2.6.39-0.rc4.git2.0
+- Update to 2.6.39-rc4-git2
+
* Tue Apr 19 2011 Dave Jones <davej@redhat.com>
- Build USB_SERIAL in instead of modular.
Enable USB_SERIAL_CONSOLE.
diff --git a/sources b/sources
index 2a993568b..58af9ee63 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2
-263cecb2d458c205e3eb30e564d2abab patch-2.6.39-rc3.bz2
-afc454cb9d04cbd78982d52a6a7c4906 patch-2.6.39-rc3-git2.bz2
+fca453ed5922747334fc518bbdcc2389 patch-2.6.39-rc4.bz2
+fa9895e6398cfb3c772b74e34db81bca patch-2.6.39-rc4-git2.bz2