From 78563abd659f34f76d2d65b9a619f42e28931d8c Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Tue, 29 Mar 2011 17:59:22 -0400 Subject: [PATCH] Update to 2.6.38-git21 --- .gitignore | 2 +- config-x86-generic | 4 ++++ config-x86_64-generic | 5 +++++ kernel.spec | 6 +++++- sources | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f04bf547..31146ed29 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ patch-*.bz2 clog *.rpm kernel-2.6.*/ -patch-2.6.38-git19.bz2 +patch-2.6.38-git21.bz2 diff --git a/config-x86-generic b/config-x86-generic index b4fe9d64a..f8ccad801 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -325,6 +325,10 @@ CONFIG_TC1100_WMI=m CONFIG_HP_WMI=m # CONFIG_INTEL_SCU_IPC is not set CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_XO15_EBOOK=m # CONFIG_TOUCHSCREEN_INTEL_MID is not set diff --git a/config-x86_64-generic b/config-x86_64-generic index 11464ebba..2449a4c85 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -119,6 +119,11 @@ CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_HP_WMI=m CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +# CONFIG_XO15_EBOOK is not set + # CONFIG_INTEL_SCU_IPC is not set # CONFIG_TOUCHSCREEN_INTEL_MID is not set diff --git a/kernel.spec b/kernel.spec index 9cc94c294..c21d502da 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 19 +%define gitrev 21 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1941,6 +1941,10 @@ fi # and build. %changelog +* Tue Mar 29 2011 Kyle McMartin 2.6.39-0.rc0.git21.0 +- Update to snapshot 2.6.38-git21 +- Enable some new x86{_64} platform drivers. + * Mon Mar 28 2011 Kyle McMartin 2.6.39-0.rc0.git19.0 - Update to snapshot 2.6.38-git19 - Drop upstream patches: diff --git a/sources b/sources index f087c628e..1d5885ab9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 -748e237a046d2f39892f94ed157a1900 patch-2.6.38-git19.bz2 +ba51c66d3748c77c1869a39a1514e0a6 patch-2.6.38-git21.bz2