diff options
| -rw-r--r-- | config-generic | 5 | ||||
| -rw-r--r-- | kernel.spec | 14 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 58eb5c9c0..250a81ff7 100644 --- a/config-generic +++ b/config-generic @@ -528,6 +528,7 @@ CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS_LOGGING=y @@ -2245,6 +2246,7 @@ CONFIG_SENSORS_LM93=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -2275,6 +2277,7 @@ CONFIG_SENSORS_W83792D=m CONFIG_SENSORS_W83793=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_WM8350=m CONFIG_SENSORS_WM831X=m @@ -2310,8 +2313,10 @@ CONFIG_SENSORS_EMC6W201=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MAX1668=m # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set diff --git a/kernel.spec b/kernel.spec index c435b527e..2c9081a98 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 12 +%define gitrev 14 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -1875,7 +1875,19 @@ fi # plz don't put in a version string unless you're going to tag # and build. +# ___________________________________________________________ +# / This branch is for Fedora 17. You probably want to commit \ +# \ to the F-16 branch instead, or in addition to this one. / +# ----------------------------------------------------------- +# \ ^__^ +# \ (@@)\_______ +# (__)\ )\/\ +# ||----w | +# || || %changelog +* Mon Aug 01 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.0-git14 + * Sat Jul 30 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.0-git12 @@ -1,2 +1,2 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -2b696847f15e0bc101acfe4cfeb7367e patch-3.0-git12.bz2 +37d9c5563df03f053d3e4bab146ef602 patch-3.0-git14.bz2 |