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

Merge tag 'omap-for-v3.10/timer-signed' of... 

Merge tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

From Tony Lindgren <tony@atomide.com>:

Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:

This series consists mainly of clean-ups for clockevents and
clocksource timers on OMAP2+ devices. The most significant change
in functionality comes from the 5th patch which is changing the
selection of the clocksource timer for OMAP3 and AM335x devices
when gptimers are used for clocksource.

Note that this series depends on 71856843 (ARM: OMAP: use
consistent error checking) in RMK's tree and 960cba67 (ARM:
OMAP5: timer: Update the clocksource name as per clock data)
in omap-for-v3.10/fixes-non-critical. So this branch is based
on a merge of 71856843 and omap-for-v3.10/fixes-non-critical
to avoid non-trivial merge conflicts.

* tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP4+: Fix sparse warning in system timers
  ARM: OMAP2+: Store ID of system timers in timer structure
  ARM: OMAP3: Update clocksource timer selection
  ARM: OMAP2+: Simplify system timers definitions
  ARM: OMAP2+: Simplify system timer clock definitions
  ARM: OMAP2+: Remove hard-coded test on timer ID
  ARM: OMAP2+: Display correct system timer name
  ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
  ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
  ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
  ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
  ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
  ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
  ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8355ae69 7f585bbf

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE