aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/SubmittingDrivers
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/SubmittingDrivers
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'Documentation/SubmittingDrivers')
-rw-r--r--Documentation/SubmittingDrivers2
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
104Control: In general if there is active maintainance of a driver by 104Control: 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