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

Commit 654b0c96 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos 

New material in the pm-qos branch depends on recent power management
fixes.
parents d031e1de d020283d

Documentation/pinctrl.txt

+8 −9
Original line number Diff line number Diff line
@@ -857,42 +857,41 @@ case), we define a mapping like this: 


...

{

	.name "2bit"

	.name = "2bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "4bit"

	.name = "4bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "4bit"

	.name = "4bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_2_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_2_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_3_grp",
@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true, 
like this:



{

	.name "POWERMAP"

	.name = "POWERMAP"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "power_func",

	.hog_on_boot = true,
@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B: 


foo_switch()

{

	struct pinmux pmx;

	struct pinmux *pmx;



	/* Enable on position A */

	pmx = pinmux_get(&device, "spi0-pos-A");

MAINTAINERS

+3 −8
Original line number Diff line number Diff line
@@ -4140,6 +4140,7 @@ F: fs/partitions/ldm.* 


LogFS

M:	Joern Engel <joern@logfs.org>

M:	Prasad Joshi <prasadjoshi.linux@gmail.com>

L:	logfs@logfs.org

W:	logfs.org

S:	Maintained
@@ -4281,13 +4282,6 @@ S: Orphan 
F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h



MAX1668 TEMPERATURE SENSOR DRIVER

M:	"David George" <david.george@ska.ac.za>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/max1668

F:	drivers/hwmon/max1668.c



MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	"Hans J. Koch" <hjk@hansjkoch.de>

L:	lm-sensors@lm-sensors.org
@@ -6678,7 +6672,7 @@ TTY LAYER 
M:	Greg Kroah-Hartman <gregkh@suse.de>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git

F:	drivers/tty/*

F:	drivers/tty/

F:	drivers/tty/serial/serial_core.c

F:	include/linux/serial_core.h

F:	include/linux/serial.h
@@ -7371,6 +7365,7 @@ S: Supported 
F:	Documentation/hwmon/wm83??

F:	arch/arm/mach-s3c64xx/mach-crag6410*

F:	drivers/leds/leds-wm83*.c

F:	drivers/hwmon/wm83??-hwmon.c

F:	drivers/input/misc/wm831x-on.c

F:	drivers/input/touchscreen/wm831x-ts.c

F:	drivers/input/touchscreen/wm97*.c

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config MICROBLAZE 
	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64



config SWAP

	def_bool n

arch/microblaze/include/asm/atomic.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_MICROBLAZE_ATOMIC_H



#include <asm-generic/atomic.h>

#include <asm-generic/atomic64.h>



/*

 * Atomically test *v and decrement if it is greater than 0.