diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
| commit | 0a8c5395f90f06d128247844b2515c8bf3f2826b (patch) | |
| tree | d95382dcdfa303b99d480c01763d6cb6767fdaca /Documentation/DocBook/networking.tmpl | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
[XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'Documentation/DocBook/networking.tmpl')
| -rw-r--r-- | Documentation/DocBook/networking.tmpl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/DocBook/networking.tmpl b/Documentation/DocBook/networking.tmpl index f24f9e85e4ae..627707a3cb9d 100644 --- a/Documentation/DocBook/networking.tmpl +++ b/Documentation/DocBook/networking.tmpl | |||
| @@ -98,9 +98,6 @@ | |||
| 98 | X!Enet/core/wireless.c | 98 | X!Enet/core/wireless.c |
| 99 | </sect1> | 99 | </sect1> |
| 100 | --> | 100 | --> |
| 101 | <sect1><title>Synchronous PPP</title> | ||
| 102 | !Edrivers/net/wan/syncppp.c | ||
| 103 | </sect1> | ||
| 104 | </chapter> | 101 | </chapter> |
| 105 | 102 | ||
| 106 | </book> | 103 | </book> |