diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /Documentation/zh_CN/SubmittingDrivers | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/zh_CN/SubmittingDrivers')
| -rw-r--r-- | Documentation/zh_CN/SubmittingDrivers | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/zh_CN/SubmittingDrivers b/Documentation/zh_CN/SubmittingDrivers index 5f4815c63ec7..c27b0f6cdd39 100644 --- a/Documentation/zh_CN/SubmittingDrivers +++ b/Documentation/zh_CN/SubmittingDrivers | |||
| @@ -165,4 +165,4 @@ Linux USB项目： | |||
| 165 | http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf | 165 | http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf |
| 166 | 166 | ||
| 167 | 内核清洁工 (Kernel Janitor): | 167 | 内核清洁工 (Kernel Janitor): |
| 168 | http://janitor.kernelnewbies.org/ | 168 | http://kernelnewbies.org/KernelJanitors |