diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /Documentation/SubmittingDrivers | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
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 24f2eb40cae5..99e72a81fa2f 100644 --- a/Documentation/SubmittingDrivers +++ b/Documentation/SubmittingDrivers | |||
| @@ -41,7 +41,7 @@ Linux 2.4: | |||
| 41 | Linux 2.6: | 41 | Linux 2.6: |
| 42 | The same rules apply as 2.4 except that you should follow linux-kernel | 42 | The same rules apply as 2.4 except that you should follow linux-kernel |
| 43 | to track changes in API's. The final contact point for Linux 2.6 | 43 | to track changes in API's. The final contact point for Linux 2.6 |
| 44 | submissions is Andrew Morton <akpm@osdl.org>. | 44 | submissions is Andrew Morton. |
| 45 | 45 | ||
| 46 | What Criteria Determine Acceptance | 46 | What Criteria Determine Acceptance |
| 47 | ---------------------------------- | 47 | ---------------------------------- |