Commit 353816f4 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 

Conflicts:
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/poodle.c
	arch/arm/mach-pxa/spitz.c
parents 160bbab3 fe0bdec6

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97 
D: sun4 port, Sparc hacker



N: Hugh Blemings

E: hugh@misc.nu

W: http://misc.nu/hugh/

D: Author and maintainer of the Keyspan USB to Serial drivers

S: Po Box 234

E: hugh@blemings.org

W: http://blemings.org/hugh

D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker

S: PO Box 234

S: Belconnen ACT 2616

S: Australia

Documentation/ABI/testing/sysfs-class-uwb_rc

+8 −6
Original line number Diff line number Diff line
@@ -32,14 +32,16 @@ Contact: linux-usb@vger.kernel.org 
Description:

                Write:



                <channel> [<bpst offset>]

                <channel>



                to start beaconing on a specific channel, or stop

                beaconing if <channel> is -1.  Valid channels depends

                on the radio controller's supported band groups.

                to force a specific channel to be used when beaconing,

                or, if <channel> is -1, to prohibit beaconing.  If

                <channel> is 0, then the default channel selection

                algorithm will be used.  Valid channels depends on the

                radio controller's supported band groups.



                <bpst offset> may be used to try and join a specific

                beacon group if more than one was found during a scan.

                Reading returns the currently active channel, or -1 if

                the radio controller is not beaconing.



What:           /sys/class/uwb_rc/uwbN/scan

Date:           July 2008

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.



DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \

DOCBOOKS := z8530book.xml mcabook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

Documentation/DocBook/networking.tmpl

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ 
X!Enet/core/wireless.c

     </sect1>

-->

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

     </sect1>

  </chapter>



</book>

Documentation/DocBook/wanbook.tmpl

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>



<book id="WANGuide">

 <bookinfo>

  <title>Synchronous PPP and Cisco HDLC Programming Guide</title>

  

  <authorgroup>

   <author>

    <firstname>Alan</firstname>

    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <copyright>

   <year>2000</year>

   <holder>Alan Cox</holder>

  </copyright>



  <legalnotice>

   <para>

     This documentation is free software; you can redistribute

     it and/or modify it under the terms of the GNU General Public

     License as published by the Free Software Foundation; either

     version 2 of the License, or (at your option) any later

     version.

   </para>

      

   <para>

     This program is distributed in the hope that it will be

     useful, but WITHOUT ANY WARRANTY; without even the implied

     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the GNU General Public License for more details.

   </para>

      

   <para>

     You should have received a copy of the GNU General Public

     License along with this program; if not, write to the Free

     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

     MA 02111-1307 USA

   </para>

      

   <para>

     For more details see the file COPYING in the source

     distribution of Linux.

   </para>

  </legalnotice>

 </bookinfo>



<toc></toc>



  <chapter id="intro">

      <title>Introduction</title>

  <para>

	The syncppp drivers in Linux provide a fairly complete 

	implementation of Cisco HDLC and a minimal implementation of

	PPP. The longer term goal is to switch the PPP layer to the

	generic PPP interface that is new in Linux 2.3.x. The API should

	remain unchanged when this is done, but support will then be

	available for IPX, compression and other PPP features

  </para>

  </chapter>

  <chapter id="bugs">

     <title>Known Bugs And Assumptions</title>

  <para>

  <variablelist>

    <varlistentry><term>PPP is minimal</term>

    <listitem>

    <para>

	The current PPP implementation is very basic, although sufficient

	for most wan usages.

    </para>

    </listitem></varlistentry>



    <varlistentry><term>Cisco HDLC Quirks</term>

    <listitem>

    <para>

	Currently we do not end all packets with the correct Cisco multicast

	or unicast flags. Nothing appears to mind too much but this should

	be corrected.

    </para>

    </listitem></varlistentry>

  </variablelist>

	

  </para>

  </chapter>



  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Edrivers/net/wan/syncppp.c

  </chapter>



</book>