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

Commit 64b36ca7 authored Feb 20, 2009 by Ingo Molnar

Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core

parents 00a8bf85 402a917a

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -692,6 +692,13 @@ M: kernel@wantstofly.org
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		ARM/NUVOTON W90X900 ARM ARCHITECTURE
		P: Wan ZongShun
		M: mcuos.com@gmail.com
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		W: http://www.mcuos.com
		S: Maintained

		ARPD SUPPORT
		P: Jonathan Layes
		L: netdev@vger.kernel.org

arch/arm/configs/at91sam9260ek_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
		# Watchdog Device Drivers
		#
		# CONFIG_SOFT_WATCHDOG is not set
		CONFIG_AT91SAM9_WATCHDOG=y
		CONFIG_AT91SAM9X_WATCHDOG=y

		#
		# USB-based Watchdog Cards

arch/arm/configs/at91sam9261ek_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -700,7 +700,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
		# Watchdog Device Drivers
		#
		# CONFIG_SOFT_WATCHDOG is not set
		CONFIG_AT91SAM9_WATCHDOG=y
		CONFIG_AT91SAM9X_WATCHDOG=y

		#
		# USB-based Watchdog Cards

arch/arm/configs/at91sam9263ek_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -710,7 +710,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
		# Watchdog Device Drivers
		#
		# CONFIG_SOFT_WATCHDOG is not set
		CONFIG_AT91SAM9_WATCHDOG=y
		CONFIG_AT91SAM9X_WATCHDOG=y

		#
		# USB-based Watchdog Cards

arch/arm/configs/at91sam9rlek_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -606,7 +606,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
		# Watchdog Device Drivers
		#
		# CONFIG_SOFT_WATCHDOG is not set
		CONFIG_AT91SAM9_WATCHDOG=y
		CONFIG_AT91SAM9X_WATCHDOG=y

		#
		# Sonics Silicon Backplane