Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks into timers/core (924412f6) · Commits · e / devices / android_kernel_teracube_emerald

MAINTAINERS

+20 −13

Original line number	Diff line number	Diff line
		@@ -2270,7 +2270,7 @@ F: include/linux/device-mapper.h
		F: include/linux/dm-*.h

		DIOLAN U2C-12 I2C DRIVER
		M: Guenter Roeck <guenter.roeck@ericsson.com>
		M: Guenter Roeck <linux@roeck-us.net>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		F: drivers/i2c/busses/i2c-diolan-u2c.c
		@@ -3145,7 +3145,7 @@ F: drivers/tty/hvc/

		HARDWARE MONITORING
		M: Jean Delvare <khali@linux-fr.org>
		M: Guenter Roeck <guenter.roeck@ericsson.com>
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		W: http://www.lm-sensors.org/
		T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
		@@ -4420,6 +4420,13 @@ S: Orphan
		F: drivers/video/matrox/matroxfb_*
		F: include/linux/matroxfb.h

		MAX16065 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		S: Maintained
		F: Documentation/hwmon/max16065
		F: drivers/hwmon/max16065.c

		MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
		M: "Hans J. Koch" <hjk@hansjkoch.de>
		L: lm-sensors@lm-sensors.org
		@@ -5158,7 +5165,7 @@ F: drivers/leds/leds-pca9532.c
		F: include/linux/leds-pca9532.h

		PCA9541 I2C BUS MASTER SELECTOR DRIVER
		M: Guenter Roeck <guenter.roeck@ericsson.com>
		M: Guenter Roeck <linux@roeck-us.net>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		F: drivers/i2c/muxes/i2c-mux-pca9541.c
		@@ -5308,7 +5315,7 @@ F: drivers/video/fb-puv3.c
		F: drivers/rtc/rtc-puv3.c

		PMBUS HARDWARE MONITORING DRIVERS
		M: Guenter Roeck <guenter.roeck@ericsson.com>
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		W: http://www.lm-sensors.org/
		W: http://www.roeck-us.net/linux/drivers/

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 5
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Saber-toothed Squirrel

		# DOCUMENTATION

arch/parisc/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ KBUILD_DEFCONFIG := default_defconfig

		NM = sh $(srctree)/arch/parisc/nm
		CHECKFLAGS += -D__hppa__=1
		LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

		MACHINE := $(shell uname -m)
		ifeq ($(MACHINE),parisc*)
		@@ -79,7 +80,7 @@ kernel-y := mm/ kernel/ math-emu/
		kernel-$(CONFIG_HPUX) += hpux/

		core-y += $(addprefix arch/parisc/, $(kernel-y))
		libs-y += arch/parisc/lib/ `$(CC) -print-libgcc-file-name`
		libs-y += arch/parisc/lib/ $(LIBGCC)

		drivers-$(CONFIG_OPROFILE) += arch/parisc/oprofile/

arch/parisc/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		include include/asm-generic/Kbuild.asm

		header-y += pdc.h
		generic-y += word-at-a-time.h

arch/parisc/include/asm/bug.h

+2 −0

Original line number	Diff line number	Diff line
		#ifndef _PARISC_BUG_H
		#define _PARISC_BUG_H

		#include <linux/kernel.h> /* for BUGFLAG_TAINT */

		/*
		* Tell the user there is some problem.
		* The offending file and line are encoded in the __bug_table section.