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

Commit 0c9de3c5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.7/omap5_arch_timer' of... 

Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
	arch/arm/mach-omap2/timer.c
parents 6bfc82ff 3c7c5dab

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -356,11 +356,11 @@ choice 
		  is nothing connected to read from the DCC.



	config DEBUG_SEMIHOSTING

		bool "Kernel low-level debug output via semihosting I"

		bool "Kernel low-level debug output via semihosting I/O"

		help

		  Semihosting enables code running on an ARM target to use

		  the I/O facilities on a host debugger/emulator through a

		  simple SVC calls. The host debugger or emulator must have

		  simple SVC call. The host debugger or emulator must have

		  semihosting enabled for the special svc call to be trapped

		  otherwise the kernel will crash.

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -284,10 +284,10 @@ zImage Image xipImage bootpImage uImage: vmlinux 
zinstall uinstall install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb:

%.dtb: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



dtbs:

dtbs: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



# We use MRPROPER_FILES and CLEAN_FILES now