summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-01 09:14:13 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-01 09:14:13 -0400
commit12ba4aac8ada7b02d9e4988bac801babe53c0f1a (patch)
treed35b122cdb05162a030809c18168a017d75e5a3b
parent3575ffb1af792af94c2cd2aec24dc9d4339337e2 (diff)
downloadkernel-12ba4aac8ada7b02d9e4988bac801babe53c0f1a.tar.gz
kernel-12ba4aac8ada7b02d9e4988bac801babe53c0f1a.tar.xz
kernel-12ba4aac8ada7b02d9e4988bac801babe53c0f1a.zip
3.0-git15 snapshot
-rw-r--r--config-powerpc-generic2
-rw-r--r--kernel.spec2
-rw-r--r--sources2
3 files changed, 4 insertions, 2 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index ef71ad14f..8533d92bd 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -314,12 +314,14 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
# CONFIG_MFD_88PM8607 is not set
# CONFIG_MFD_MAX8997 is not set
# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
# CONFIG_MFD_WL1273_CORE is not set
# CONFIG_XPS_USB_HCD_XILINX is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
# CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_GPIO_SCH is not set
diff --git a/kernel.spec b/kernel.spec
index 2c9081a98..b6cb1fc80 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 14
+%define gitrev 15
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
diff --git a/sources b/sources
index a010b8c96..6bf8b86b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
-37d9c5563df03f053d3e4bab146ef602 patch-3.0-git14.bz2
+0602bbd9a01652a160dac6461b58dbf0 patch-3.0-git15.bz2