diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-07 04:24:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-07 04:24:21 -0700 |
| commit | b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d (patch) | |
| tree | a0d2e6dd179e5d057776edd0ed865bc744dfa54d | |
| parent | a93958ac980f0ce594ad90657ecbc595ff157a40 (diff) | |
| parent | 0c0c9e7076b69f93678e4ec711e2bf237398e623 (diff) | |
| download | linux-b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d.tar.gz linux-b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d.tar.bz2 linux-b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
133 files changed, 4465 insertions, 4698 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index de491a3e2313..edb2f0b07616 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -437,3 +437,10 @@ Why: Superseded by tdfxfb. I2C/DDC support used to live in a separate driver but this caused driver conflicts. Who: Jean Delvare <khali@linux-fr.org> Krzysztof Helt <krzysztof.h1@wp.pl> + +--------------------------- + +What: CONFIG_RFKILL_INPUT +When: 2.6.33 +Why: Should be implemented in userspace, policy daemon. +Who: Johannes Berg <johannes@sipsolutions.net> diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt index 40c3a3f10816..1b74b5f30af4 100644 --- a/Documentation/rfkill.txt +++ b/Documentation/rfkill.txt @@ -1,571 +1,136 @@ -rfkill - RF switch subsyst |