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

Commit b536661b authored Sep 21, 2012 by Olof Johansson

Merge branch 'v3.7-samsung-fixes-1' of...

Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

A few non-critical fixes/cleanups for samsung platforms.

* 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
  ARM: S3C24XX: removes unnecessary semicolon
  ARM: S3C24xx: delete double assignment
  ARM: EXYNOS: fix address for EXYNOS4 MDMA1
  ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
  + sync to 3.6-rc6

parents 20804abd fb997a46

Documentation/i2c/busses/i2c-i801

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Supported adapters:
	* Intel DH89xxCC (PCH)		* Intel DH89xxCC (PCH)
	* Intel Panther Point (PCH)		* Intel Panther Point (PCH)
	* Intel Lynx Point (PCH)		* Intel Lynx Point (PCH)
			* Intel Lynx Point-LP (PCH)
	Datasheets: Publicly available at the Intel website		Datasheets: Publicly available at the Intel website

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

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
	L: linux-i2c@vger.kernel.org		L: linux-i2c@vger.kernel.org
	W: http://i2c.wiki.kernel.org/		W: http://i2c.wiki.kernel.org/
	T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/		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		S: Maintained
	F: Documentation/i2c/		F: Documentation/i2c/
	F: drivers/i2c/		F: drivers/i2c/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc5		EXTRAVERSION = -rc6
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/Kconfig.debug

+3 −3

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

	config DEBUG_SEMIHOSTING		config DEBUG_SEMIHOSTING
	bool "Kernel low-level debug output via semihosting I"		bool "Kernel low-level debug output via semihosting I/O"
	help		help
	Semihosting enables code running on an ARM target to use		Semihosting enables code running on an ARM target to use
	the I/O facilities on a host debugger/emulator through a		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		semihosting enabled for the special svc call to be trapped
	otherwise the kernel will crash.		otherwise the kernel will crash.

arch/arm/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -284,10 +284,10 @@ zImage Image xipImage bootpImage uImage: vmlinux
	zinstall uinstall install: vmlinux		zinstall uinstall install: vmlinux
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@		$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@

	%.dtb:		%.dtb: scripts
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@		$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

	dtbs:		dtbs: scripts
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@		$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

	# We use MRPROPER_FILES and CLEAN_FILES now		# We use MRPROPER_FILES and CLEAN_FILES now