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

Commit ac5ac893 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v3.10/soc' of... 

Merge tag 'davinci-for-v3.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori <nsekhar@ti.com>:

v3.10 SoC updates for DaVinci

a) adds support for eHRPWM clocks
b) Fix the way MMC/SD IP versions are communicated to driver
   in preparation for DT support
c) Minor cleanup in debug-macro.S

* tag 'davinci-for-v3.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: remove test for undefined Kconfig macro
  ARM: davinci: mmc: derive version information from device name
  ARM: davinci: da850: add ECAP & EHRPWM clock nodes
  ARM: davinci: clk framework support for enable/disable functionality

Includes an update to Linux 3.9-rc5

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0b191110 93bd6515

Documentation/networking/ipvs-sysctl.txt

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ amemthresh - INTEGER 
        enabled and the variable is automatically set to 2, otherwise

        the strategy is disabled and the variable is  set  to 1.



backup_only - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	If set, disable the director function while the server is

	in backup mode to avoid packet loops for DR/TUN methods.



conntrack - BOOLEAN

	0 - disabled (default)

	not 0 - enabled

MAINTAINERS

+12 −11
Original line number Diff line number Diff line
@@ -3242,6 +3242,12 @@ F: Documentation/firmware_class/ 
F:	drivers/base/firmware*.c

F:	include/linux/firmware.h



FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)

M:	Joshua Morris <josh.h.morris@us.ibm.com>

M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>

S:	Maintained

F:	drivers/block/rsxx/



FLOPPY DRIVER

M:	Jiri Kosina <jkosina@suse.cz>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -5683,7 +5689,7 @@ S: Maintained 
F:	arch/arm/*omap*/*clock*



OMAP POWER MANAGEMENT SUPPORT

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/*omap*/*pm*
@@ -5777,7 +5783,7 @@ F: arch/arm/*omap*/usb* 


OMAP GPIO DRIVER

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

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/gpio/gpio-omap.c
@@ -6209,7 +6215,7 @@ F: include/linux/power_supply.h 
F:	drivers/power/



PNP SUPPORT

M:	Adam Belay <abelay@mit.edu>

M:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

M:	Bjorn Helgaas <bhelgaas@google.com>

S:	Maintained

F:	drivers/pnp/
@@ -6551,12 +6557,6 @@ S: Maintained 
F:	Documentation/blockdev/ramdisk.txt

F:	drivers/block/brd.c



RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)

M:	Joshua Morris <josh.h.morris@us.ibm.com>

M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>

S:	Maintained

F:	drivers/block/rsxx/



RANDOM NUMBER DRIVER

M:	Theodore Ts'o" <tytso@mit.edu>

S:	Maintained
@@ -7173,7 +7173,7 @@ F: arch/arm/mach-s3c2410/bast-irq.c 


TI DAVINCI MACHINE SUPPORT

M:	Sekhar Nori <nsekhar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

T:	git git://gitorious.org/linux-davinci/linux-davinci.git

Q:	http://patchwork.kernel.org/project/linux-davinci/list/
@@ -7706,9 +7706,10 @@ F: include/linux/swiotlb.h 


SYNOPSYS ARC ARCHITECTURE

M:	Vineet Gupta <vgupta@synopsys.com>

L:	linux-snps-arc@vger.kernel.org

S:	Supported

F:	arch/arc/

F:	Documentation/devicetree/bindings/arc/

F:	drivers/tty/serial/arc-uart.c



SYSV FILESYSTEM

M:	Christoph Hellwig <hch@infradead.org>

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arc/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, 
	int i;



	for_each_sg(sg, s, nents, i)

		sg->dma_address = dma_map_page(dev, sg_page(s), s->offset,

		s->dma_address = dma_map_page(dev, sg_page(s), s->offset,

					       s->length, dir);



	return nents;

arch/arc/include/asm/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -72,7 +72,4 @@ extern int elf_check_arch(const struct elf32_hdr *); 
 */

#define ELF_PLATFORM	(NULL)



#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif