Commit 5bdc22a5 authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c
parents b6f40988 e92427b2

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>



  <chapter id="fbdev">

Documentation/DocBook/dvb/dvbapi.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
	<holder>Convergence GmbH</holder>

</copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

Documentation/DocBook/media.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
<title>LINUX MEDIA INFRASTRUCTURE API</title>



<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>LinuxTV Developers</holder>

</copyright>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</author>

</authorgroup>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

Documentation/DocBook/v4l/dev-rds.xml

+4 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ as follows:</para> 
  </section>



  <section>

    <title>RDS datastructures</title>

    <table frame="none" pgwide="1" id="v4l2-rds-data">

      <title>struct

<structname>v4l2_rds_data</structname></title>
@@ -129,10 +130,11 @@ as follows:</para> 


    <table frame="none" pgwide="1" id="v4l2-rds-block-codes">

      <title>Block defines</title>

      <tgroup cols="3">

      <tgroup cols="4">

	<colspec colname="c1" colwidth="1*" />

	<colspec colname="c2" colwidth="1*" />

	<colspec colname="c3" colwidth="5*" />

	<colspec colname="c3" colwidth="1*" />

	<colspec colname="c4" colwidth="5*" />

	<tbody valign="top">

	  <row>

	    <entry>V4L2_RDS_BLOCK_MSK</entry>

Documentation/DocBook/v4l/v4l2.xml

+2 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Remote Controller chapter.</contrib> 
      <year>2008</year>

      <year>2009</year>

      <year>2010</year>

      <year>2011</year>

      <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin

Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>

    </copyright>
@@ -381,7 +382,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 2.6.33</subtitle>

 <subtitle>Revision 2.6.38</subtitle>



  <chapter id="common">

    &sub-common;