diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /Documentation/SubmittingDrivers | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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 |