linux-next: manual merge of the wireless tree with the x86 tree

linux-next: manual merge of the wireless tree with the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1480 bytes --]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
45f458e9a8a216b02b76fe61d9e8bc40d659fbe8 ("x86, mce: deprecate old 32bit
machine check code") from the x86 tree and commit
0122405503e36bd15077acb571821d459bbd3e85 ("rfkill: create useful
userspace interface") from the wireless tree.

Juts overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/feature-removal-schedule.txt
index ec9ef5d,edb2f0b..0000000
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -438,12 -438,9 +438,19 @@@ Why:	Superseded by tdfxfb. I2C/DDC supp
  Who:	Jean Delvare <khali@linux-fr.org>
  	Krzysztof Helt <krzysztof.h1@wp.pl>
  
 +----------------------------
 +
 +What:	CONFIG_X86_OLD_MCE
 +When:	2.6.32
 +Why:	Remove the old legacy 32bit machine check code. This has been
 +	superseded by the newer machine check code from the 64bit port,
 +	but the old version has been kept around for easier testing. Note this
 +	doesn't impact the old P5 and WinChip machine check handlers.
 +Who:	Andi Kleen <andi@firstfloor.org>
++
+ ---------------------------
+ 
+ What:	CONFIG_RFKILL_INPUT
+ When:	2.6.33
+ Why:	Should be implemented in userspace, policy daemon.
+ Who:	Johannes Berg <johannes@sipsolutions.net>

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]