Commit da935c66 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:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c
parents 9435eb1c 2205a6ea

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Documentation/DocBook/drm.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
      services.

    </para>

    <para>

      The core of every DRM driver is struct drm_device.  Drivers

      will typically statically initialize a drm_device structure,

      The core of every DRM driver is struct drm_driver.  Drivers

      will typically statically initialize a drm_driver structure,

      then pass it to drm_init() at load time.

    </para>
@@ -84,7 +84,7 @@ 
    <title>Driver initialization</title>

    <para>

      Before calling the DRM initialization routines, the driver must

      first create and fill out a struct drm_device structure.

      first create and fill out a struct drm_driver structure.

    </para>

    <programlisting>

      static struct drm_driver driver = {