diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/SubmittingDrivers | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/SubmittingDrivers')
| -rw-r--r-- | Documentation/SubmittingDrivers | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers index 38d2aab59cac..319baa8b60dd 100644 --- a/Documentation/SubmittingDrivers +++ b/Documentation/SubmittingDrivers | |||
| @@ -101,7 +101,7 @@ PM support: Since Linux is used on many portable and desktop systems, your | |||
| 101 | complete overview of the power management issues related to | 101 | complete overview of the power management issues related to |
| 102 | drivers see Documentation/power/devices.txt . | 102 | drivers see Documentation/power/devices.txt . |
| 103 | 103 | ||
| 104 | Control: In general if there is active maintainance of a driver by | 104 | Control: In general if there is active maintenance of a driver by |
| 105 | the author then patches will be redirected to them unless | 105 | the author then patches will be redirected to them unless |
| 106 | they are totally obvious and without need of checking. | 106 | they are totally obvious and without need of checking. |
| 107 | If you want to be the contact and update point for the | 107 | If you want to be the contact and update point for the |