diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-24 09:32:31 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-24 09:32:31 -0400 |
| commit | ea3aaf7b014b4bd0237dd42603f56c30730f6a0d (patch) | |
| tree | 3f15b529a7d689e58ad64fdf55469375c3171b09 | |
| parent | 4d5b4fb36b4d5a01b2267e5c39ba650ce04aca40 (diff) | |
| download | kernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.tar.gz kernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.tar.xz kernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.zip | |
Linux v4.5-12149-gaca04ce
- net, pwm, target, platform-drivers merges
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-x86-generic | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/config-generic b/config-generic index 9bccf5ec0..cbbf49eeb 100644 --- a/config-generic +++ b/config-generic @@ -1459,6 +1459,7 @@ CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m CONFIG_CHELSIO_T4_DCB=y # CONFIG_CHELSIO_T4_FCOE is not set +# CONFIG_CHELSIO_T4_UWIRE is not set CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m diff --git a/config-x86-generic b/config-x86-generic index ce2170e5a..606227d45 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -228,6 +228,7 @@ CONFIG_AMILO_RFKILL=m CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_WIRELESS=m CONFIG_COMPAL_LAPTOP=m +CONFIG_DELL_SMBIOS=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m CONFIG_CHROMEOS_LAPTOP=m @@ -1 +1 @@ -c130423620331a104492bbbcc49f25125e26a21a +aca04ce5dbda50758b813b1e3d710098991cfa9a diff --git a/kernel.spec b/kernel.spec index e636a6b38..4703cb7d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 22 +%define gitrev 23 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2165,6 +2165,10 @@ fi # # %changelog +* Thu Mar 24 2016 jwboyer@gmail.com - 4.6.0-0.rc0.git23.1 +- Linux v4.5-12149-gaca04ce +- net, pwm, target, platform-drivers merges + * Wed Mar 23 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git22.1 - Linux v4.5-12013-gc13042362033 - crypto, mailbox, clk merges @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -1efd8aeadf2822f23214a5129575a8f6 patch-4.5-git22.xz +abe8776dc52dc9be730b3bab89855b41 patch-4.5-git23.xz |