diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /Documentation/feature-removal-schedule.txt | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 4cba260e3059..19132cadc18d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -215,7 +215,7 @@ Who: Zhang Rui <rui.zhang@intel.com> | |||
| 215 | What: CONFIG_ACPI_PROCFS_POWER | 215 | What: CONFIG_ACPI_PROCFS_POWER |
| 216 | When: 2.6.39 | 216 | When: 2.6.39 |
| 217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, | 217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, |
| 218 | has been working in upstream kenrel since 2.6.24, Sep 2007. | 218 | has been working in upstream kernel since 2.6.24, Sep 2007. |
| 219 | In 2.6.37, we make the sysfs I/F always built in and this option | 219 | In 2.6.37, we make the sysfs I/F always built in and this option |
| 220 | disabled by default. | 220 | disabled by default. |
| 221 | Remove this option and the ACPI power procfs interface in 2.6.39. | 221 | Remove this option and the ACPI power procfs interface in 2.6.39. |