Commit 5845c13a authored by Sarah Sharp's avatar Sarah Sharp
Browse files

Merge tag 'for-usb-2013-08-15-step-1' into for-usb-next 

xhci: Step 1 to fix usb-linus and usb-next.

Hi Greg,

This is the first of three steps to fix your usb-linus and usb-next
trees.  As I mentioned, commit 4fae6f0f
"USB: handle LPM errors during device suspend correctly" was incorrectly
added to usb-next when it should have been added to usb-linus and marked
for stable.

Two port power off bug fixes touch the same code that patch touches, but
it's not easy to simply move commit 4fae6f0f patch to usb-linus because
commit 28e86165 "USB: refactor code for
enabling/disabling remote wakeup" also touched those code sections.

I propose a two step process to fix this:

1. Pull these four patches into usb-linus.

2. Revert commit 28e86165 from usb-next.
   Merge usb-linus into usb-next, and resolve the conflicts.

I will be sending pull requests for these steps.

This pull request is step one, and contains the backported version of
commit 4fae6f0f, the two port power off
fixes, and an unrelated xhci-plat bug fix.

Sarah Sharp

Resolved conflicts:
	drivers/usb/core/hub.c
parents 224563b6 52fb6125

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
Required properties :



 - reg             : Offset and length of the register set for the device

 - compatible      : Should be "marvell,mv64xxx-i2c"

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

 - interrupts      : The interrupt number



Optional properties :

Documentation/devicetree/bindings/regulator/palmas-pmic.txt

+1 −3
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ Optional nodes: 
	       Optional sub-node properties:

	       ti,warm-reset - maintain voltage during warm reset(boolean)

	       ti,roof-floor - control voltage selection by pin(boolean)

	       ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       2 - eco, 3 - forced pwm

	       ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us

	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       0 - low range, 1 - high range.
@@ -59,7 +58,6 @@ pmic { 
			ti,warm-reset;

			ti,roof-floor;

			ti,mode-sleep = <0>;

			ti,tstep = <0>;

			ti,smps-range = <1>;

		};

MAINTAINERS

+11 −1
Original line number Diff line number Diff line
@@ -965,6 +965,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE

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

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-keystone/



ARM/LOGICPD PXA270 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1259,7 +1265,6 @@ F: drivers/rtc/rtc-coh901331.c 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/Ux500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -8664,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git 
S:	Maintained

F:	sound/usb/midi.*



USB NETWORKING DRIVERS

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

F:	drivers/net/usb/



USB OHCI DRIVER

M:	Alan Stern <stern@rowland.harvard.edu>

L:	linux-usb@vger.kernel.org

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Linux for Workgroups



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE