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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	include/net/ipip.h

The changes made to ipip.h in 'net' were already included
in 'net-next' before that header was moved to another location.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7559d979 a8c45289

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Supported adapters: 
    Documentation:

	http://www.diolan.com/i2c/u2c12.html



Author: Guenter Roeck <guenter.roeck@ericsson.com>

Author: Guenter Roeck <linux@roeck-us.net>



Description

-----------

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    models depending on the codec chip.  The list of available models

    is found in HD-Audio-Models.txt



    The model name "genric" is treated as a special case.  When this

    The model name "generic" is treated as a special case.  When this

    model is given, the driver uses the generic codec parser without

    "codec-patch".  It's sometimes good for testing and debugging.

Documentation/sound/alsa/seq_oss.html

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ sample data. 
<H4>

7.2.4 Close Callback</H4>

The <TT>close</TT> callback is called when this device is closed by the

applicaion. If any private data was allocated in open callback, it must

application. If any private data was allocated in open callback, it must

be released in the close callback. The deletion of ALSA port should be

done here, too. This callback must not be NULL.

<H4>

MAINTAINERS

+18 −4
Original line number Diff line number Diff line
@@ -1461,6 +1461,12 @@ F: drivers/dma/at_hdmac.c 
F:	drivers/dma/at_hdmac_regs.h

F:	include/linux/platform_data/dma-atmel.h



ATMEL I2C DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

L:	linux-i2c@vger.kernel.org

S:	Supported

F:	drivers/i2c/busses/i2c-at91.c



ATMEL ISI DRIVER

M:	Josh Wu <josh.wu@atmel.com>

L:	linux-media@vger.kernel.org
@@ -2623,7 +2629,7 @@ F: include/uapi/drm/ 


INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

L:	intel-gfx@lists.freedesktop.org (subscribers-only)

L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

T:	git git://people.freedesktop.org/~danvet/drm-intel

S:	Supported
@@ -5641,6 +5647,14 @@ S: Maintained 
F:	drivers/video/riva/

F:	drivers/video/nvidia/



NVM EXPRESS DRIVER

M:	Matthew Wilcox <willy@linux.intel.com>

L:	linux-nvme@lists.infradead.org

T:	git git://git.infradead.org/users/willy/linux-nvme.git

S:	Supported

F:	drivers/block/nvme.c

F:	include/linux/nvme.h



OMAP SUPPORT

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org
@@ -5669,7 +5683,7 @@ S: Maintained 
F:	arch/arm/*omap*/*clock*



OMAP POWER MANAGEMENT SUPPORT

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/*omap*/*pm*
@@ -5763,7 +5777,7 @@ F: arch/arm/*omap*/usb* 


OMAP GPIO DRIVER

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/gpio/gpio-omap.c
@@ -7161,7 +7175,7 @@ F: arch/arm/mach-s3c2410/bast-irq.c 


TI DAVINCI MACHINE SUPPORT

M:	Sekhar Nori <nsekhar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

T:	git git://gitorious.org/linux-davinci/linux-davinci.git

Q:	http://patchwork.kernel.org/project/linux-davinci/list/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Unicycling Gorilla



# *DOCUMENTATION*