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

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

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

parents 1d578303 805a6af8

MAINTAINERS

+5 −6
Original line number Diff line number Diff line
@@ -1698,11 +1698,9 @@ F: arch/x86/include/asm/tce.h 


CAN NETWORK LAYER

M:	Oliver Hartkopp <socketcan@hartkopp.net>

M:	Oliver Hartkopp <oliver.hartkopp@volkswagen.de>

M:	Urs Thuermann <urs.thuermann@volkswagen.de>

L:	linux-can@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

W:	http://gitorious.org/linux-can

T:	git git://gitorious.org/linux-can/linux-can-next.git

S:	Maintained

F:	net/can/

F:	include/linux/can.h
@@ -1713,9 +1711,10 @@ F: include/linux/can/gw.h 


CAN NETWORK DRIVERS

M:	Wolfgang Grandegger <wg@grandegger.com>

M:	Marc Kleine-Budde <mkl@pengutronix.de>

L:	linux-can@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

W:	http://gitorious.org/linux-can

T:	git git://gitorious.org/linux-can/linux-can-next.git

S:	Maintained

F:	drivers/net/can/

F:	include/linux/can/dev.h

Makefile

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

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

drivers/gpu/drm/radeon/radeon_atombios.c

+5 −1
Original line number Diff line number Diff line
@@ -2560,7 +2560,11 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) 


	rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;

	rdev->pm.current_clock_mode_index = 0;

	rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;

	if (rdev->pm.default_power_state_index >= 0)

		rdev->pm.current_vddc =

			rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;

	else

		rdev->pm.current_vddc = 0;

}



void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable)

drivers/net/ethernet/freescale/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ if NET_VENDOR_FREESCALE 
config FEC

	tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

	depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \

		   ARCH_MXC || ARCH_MXS)

	default ARCH_MXC || ARCH_MXS if ARM

		   ARCH_MXC || SOC_IMX28)

	default ARCH_MXC || SOC_IMX28 if ARM

	select PHYLIB

	---help---

	  Say Y here if you want to use the built-in 10/100 Fast ethernet

drivers/net/wireless/ath/ath9k/main.c

+3 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, 
	struct ath_softc *sc = hw->priv;

	struct ath_node *an = (struct ath_node *) sta->drv_priv;



	if (!(sc->sc_flags & SC_OP_TXAGGR))

		return;



	switch (cmd) {

	case STA_NOTIFY_SLEEP:

		an->sleeping = true;