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

Commit 6e7f7cfc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.9/usb-signed' of... 

Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

These changes contain the OMAP USB related platform data changes
that were dropped from linux next because of the merge conflicts
as requested by me and Olof. The reason was that at this point
we really should be able to do the arch/arm related changes
separately from driver changes to avoid dependencies between
branches.

These patches were initially part of the USB related MFD patches.
Based on our comments, Roger Quadros quickly reworked these
patches into a shared branch between ARM SoC tree and the MFD
tree, then separate patches for the OMAP platform data and
MFD driver.

Note that this branch will conflict with c1d1cd59
("ARM: OMAP2+: omap_device: remove obsolete pm_lats and
early_device code"). Please see http://lkml.org/lkml/2013/2/11/16


for the merge resolution.

[arnd - resolved the merge conflict]

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 001c5c4a 64ff1673

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			real-time workloads.  It can also improve energy

			efficiency for asymmetric multiprocessors.



	rcu_nocbs_poll	[KNL,BOOT]

	rcu_nocb_poll	[KNL,BOOT]

			Rather than requiring that offloaded CPUs

			(specified by rcu_nocbs= above) explicitly

			awaken the corresponding "rcuoN" kthreads,

Documentation/x86/boot.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment 
Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

		protocol entry point.



Protocol 2.12:	(Kernel 3.9) Added the xloadflags field and extension fields

Protocol 2.12:	(Kernel 3.8) Added the xloadflags field and extension fields

	 	to struct boot_params for for loading bzImage and ramdisk

		above 4G in 64bit.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE 
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

W:	http://www.atmel.com/products/AVR32/

W:	http://avr32linux.org/

W:	http://mirror.egtvedt.no/avr32linux.org/

W:	http://avrfreaks.net/

S:	Maintained

F:	arch/avr32/

Makefile

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

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arm/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
 */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)

#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(0x01000000))

#define TASK_UNMAPPED_BASE	(UL(CONFIG_PAGE_OFFSET) / 3)

#define TASK_UNMAPPED_BASE	ALIGN(TASK_SIZE / 3, SZ_16M)



/*

 * The maximum size of a 26-bit user space task.