forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linux-2.6' into for-2.6.22
- Loading branch information
Showing
1,949 changed files
with
101,014 additions
and
76,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,6 +67,8 @@ Koushik <[email protected]> | |
| Leonid I Ananiev <[email protected]> | ||
| Linas Vepstas <[email protected]> | ||
| Matthieu CASTET <[email protected]> | ||
| Michael Buesch <[email protected]> | ||
| Michael Buesch <[email protected]> | ||
| Michel Dänzer <[email protected]> | ||
| Mitesh shah <[email protected]> | ||
| Morten Welinder <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -317,6 +317,12 @@ S: 2322 37th Ave SW | |
| S: Seattle, Washington 98126-2010 | ||
| S: USA | ||
|
|
||
| N: Johannes Berg | ||
| E: [email protected] | ||
| W: http://johannes.sipsolutions.net/ | ||
| P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5 | ||
| D: powerpc & 802.11 hacker | ||
|
|
||
| N: Stephen R. van den Berg (AKA BuGless) | ||
| E: [email protected] | ||
| D: General kernel, gcc, and libc hacker | ||
|
|
@@ -2286,14 +2292,14 @@ S: D-90453 Nuernberg | |
| S: Germany | ||
|
|
||
| N: Arnaldo Carvalho de Melo | ||
| E: [email protected] | ||
| E: [email protected] | ||
| E: [email protected] | ||
| E: [email protected] | ||
| W: http://oops.ghostprotocols.net:81/blog/ | ||
| P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 | ||
| D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks | ||
| S: Mandriva | ||
| S: R. Tocantins, 89 - Cristo Rei | ||
| S: 80050-430 - Curitiba - Paran� | ||
| S: R. Bras�lio Itiber�, 4270/1010 - �gua Verde | ||
| S: 80240-060 - Curitiba - Paran� | ||
| S: Brazil | ||
|
|
||
| N: Karsten Merker | ||
|
|
@@ -3295,6 +3301,14 @@ S: 12725 SW Millikan Way, Suite 400 | |
| S: Beaverton, Oregon 97005 | ||
| S: USA | ||
|
|
||
| N: Li Yang | ||
| E: [email protected] | ||
| D: Freescale Highspeed USB device driver | ||
| D: Freescale QE SoC support and Ethernet driver | ||
| S: B-1206 Jingmao Guojigongyu | ||
| S: 16 Baliqiao Nanjie, Beijing 101100 | ||
| S: People's Repulic of China | ||
|
|
||
| N: Marcelo Tosatti | ||
| E: [email protected] | ||
| D: v2.4 kernel maintainer | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| What: /sys/bus/usb/devices/.../power/autosuspend | ||
| Date: March 2007 | ||
| KernelVersion: 2.6.21 | ||
| Contact: Alan Stern <[email protected]> | ||
| Description: | ||
| Each USB device directory will contain a file named | ||
| power/autosuspend. This file holds the time (in seconds) | ||
| the device must be idle before it will be autosuspended. | ||
| 0 means the device will be autosuspended as soon as | ||
| possible. Negative values will prevent the device from | ||
| being autosuspended at all, and writing a negative value | ||
| will resume the device if it is already suspended. | ||
|
|
||
| The autosuspend delay for newly-created devices is set to | ||
| the value of the usbcore.autosuspend module parameter. | ||
|
|
||
| What: /sys/bus/usb/devices/.../power/level | ||
| Date: March 2007 | ||
| KernelVersion: 2.6.21 | ||
| Contact: Alan Stern <[email protected]> | ||
| Description: | ||
| Each USB device directory will contain a file named | ||
| power/level. This file holds a power-level setting for | ||
| the device, one of "on", "auto", or "suspend". | ||
|
|
||
| "on" means that the device is not allowed to autosuspend, | ||
| although normal suspends for system sleep will still | ||
| be honored. "auto" means the device will autosuspend | ||
| and autoresume in the usual manner, according to the | ||
| capabilities of its driver. "suspend" means the device | ||
| is forced into a suspended state and it will not autoresume | ||
| in response to I/O requests. However remote-wakeup requests | ||
| from the device may still be enabled (the remote-wakeup | ||
| setting is controlled separately by the power/wakeup | ||
| attribute). | ||
|
|
||
| During normal use, devices should be left in the "auto" | ||
| level. The other levels are meant for administrative uses. | ||
| If you want to suspend a device immediately but leave it | ||
| free to wake up in response to I/O requests, you should | ||
| write "0" to power/autosuspend. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,18 @@ be removed from this file. | |
|
|
||
| --------------------------- | ||
|
|
||
| What: V4L2 VIDIOC_G_MPEGCOMP and VIDIOC_S_MPEGCOMP | ||
| When: October 2007 | ||
| Why: Broken attempt to set MPEG compression parameters. These ioctls are | ||
| not able to implement the wide variety of parameters that can be set | ||
| by hardware MPEG encoders. A new MPEG control mechanism was created | ||
| in kernel 2.6.18 that replaces these ioctls. See the V4L2 specification | ||
| (section 1.9: Extended controls) for more information on this topic. | ||
| Who: Hans Verkuil <[email protected]> and | ||
| Mauro Carvalho Chehab <[email protected]> | ||
|
|
||
| --------------------------- | ||
|
|
||
| What: /sys/devices/.../power/state | ||
| dev->power.power_state | ||
| dpm_runtime_{suspend,resume)() | ||
|
|
@@ -134,15 +146,6 @@ Who: Arjan van de Ven <[email protected]> | |
|
|
||
| --------------------------- | ||
|
|
||
| What: mount/umount uevents | ||
| When: February 2007 | ||
| Why: These events are not correct, and do not properly let userspace know | ||
| when a file system has been mounted or unmounted. Userspace should | ||
| poll the /proc/mounts file instead to detect this properly. | ||
| Who: Greg Kroah-Hartman <[email protected]> | ||
|
|
||
| --------------------------- | ||
|
|
||
| What: USB driver API moves to EXPORT_SYMBOL_GPL | ||
| When: February 2008 | ||
| Files: include/linux/usb.h, drivers/usb/core/driver.c | ||
|
|
@@ -211,15 +214,6 @@ Who: Adrian Bunk <[email protected]> | |
|
|
||
| --------------------------- | ||
|
|
||
| What: IPv4 only connection tracking/NAT/helpers | ||
| When: 2.6.22 | ||
| Why: The new layer 3 independant connection tracking replaces the old | ||
| IPv4 only version. After some stabilization of the new code the | ||
| old one will be removed. | ||
| Who: Patrick McHardy <[email protected]> | ||
|
|
||
| --------------------------- | ||
|
|
||
| What: ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver | ||
| When: December 2006 | ||
| Why: Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are | ||
|
|
@@ -294,22 +288,29 @@ Who: Richard Purdie <[email protected]> | |
|
|
||
| --------------------------- | ||
|
|
||
| What: Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK) | ||
| When: with the merge of wireless-dev, 2.6.22 or later | ||
| Why: The option/code is | ||
| * not enabled on most kernels | ||
| * not required by any userspace tools (except an experimental one, | ||
| and even there only for some parts, others use ioctl) | ||
| * pointless since wext is no longer evolving and the ioctl | ||
| interface needs to be kept | ||
| Who: Johannes Berg <[email protected]> | ||
|
|
||
| --------------------------- | ||
|
|
||
| What: i8xx_tco watchdog driver | ||
| When: in 2.6.22 | ||
| Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt | ||
| watchdog driver. | ||
| Who: Wim Van Sebroeck <[email protected]> | ||
|
|
||
| --------------------------- | ||
|
|
||
| What: Multipath cached routing support in ipv4 | ||
| When: in 2.6.23 | ||
| Why: Code was merged, then submitter immediately disappeared leaving | ||
| us with no maintainer and lots of bugs. The code should not have | ||
| been merged in the first place, and many aspects of it's | ||
| implementation are blocking more critical core networking | ||
| development. It's marked EXPERIMENTAL and no distribution | ||
| enables it because it cause obscure crashes due to unfixable bugs | ||
| (interfaces don't return errors so memory allocation can't be | ||
| handled, calling contexts of these interfaces make handling | ||
| errors impossible too because they get called after we've | ||
| totally commited to creating a route object, for example). | ||
| This problem has existed for years and no forward progress | ||
| has ever been made, and nobody steps up to try and salvage | ||
| this code, so we're going to finally just get rid of it. | ||
| Who: David S. Miller <[email protected]> | ||
|
|
||
| --------------------------- | ||
Oops, something went wrong.