Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05930f5 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:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b65f63ee 41a00f79

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			improve throughput, but will also increase the

			amount of memory reserved for use by the client.



	swapaccount[=0|1]

	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -5884,7 +5884,7 @@ F: drivers/i2c/busses/i2c-omap.c 
F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	devicetree@vger.kernel.org
@@ -5964,14 +5964,14 @@ S: Maintained 
F:	drivers/char/hw_random/omap-rng.c



OMAP HWMOD SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -7367,7 +7367,6 @@ F: drivers/net/ethernet/sfc/ 


SGI GRU DRIVER

M:	Dimitri Sivanich <sivanich@sgi.com>

M:	Robin Holt <holt@sgi.com>

S:	Maintained

F:	drivers/misc/sgi-gru/
@@ -7387,7 +7386,8 @@ S: Maintained for 2.6. 
F:	Documentation/sgi-visws.txt



SGI XP/XPC/XPNET DRIVER

M:	Robin Holt <holt@sgi.com>

M:	Cliff Whickman <cpw@sgi.com>

M:	Robin Holt <robinmholt@gmail.com>

S:	Maintained

F:	drivers/misc/sgi-xp/

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/arm/boot/dts/at91sam9n12ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
	compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";



	chosen {

		bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

	};



	memory {

		reg = <0x20000000 0x10000000>;

		reg = <0x20000000 0x8000000>;

	};



	clocks {

arch/arm/boot/dts/at91sam9x5ek.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -94,8 +94,9 @@ 


		usb0: ohci@00600000 {

			status = "okay";

			num-ports = <2>;

			atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW

			num-ports = <3>;

			atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */

					   &pioD 19 GPIO_ACTIVE_LOW

					   &pioD 20 GPIO_ACTIVE_LOW

					  >;

		};