From: Jiri Kosina Date: Tue, 26 Apr 2011 08:22:15 +0000 (+0200) Subject: Merge branch 'master' into for-next X-Git-Url: http://git.alex.org.uk Merge branch 'master' into for-next Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch. --- 07f9479a40cc778bc1462ada11f95b01360ae4ff diff --cc include/video/newport.h index db9d9e3,3d7c4b4..de980a3 --- a/include/video/newport.h +++ b/include/video/newport.h @@@ -3,9 -3,9 +3,9 @@@ * newport.h: Defines and register layout for NEWPORT graphics * hardware. * - * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) + * Copyright (C) 1996 David S. Miller (davem@davemloft.net) * - * Ulf Carlsson - Compability with the IRIX structures added + * Ulf Carlsson - Compatibility with the IRIX structures added */ #ifndef _SGI_NEWPORT_H diff --cc lib/Kconfig.debug index b38cc34,c768bcd..a86bec1 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@@ -7,9 -7,19 +7,20 @@@ config PRINTK_TIM included in printk output. This allows you to measure the interval between kernel operations, including bootup operations. This is useful for identifying long delays - in kernel startup. + in kernel startup. Or add printk.time=1 at boot-time. + See Documentation/kernel-parameters.txt + config DEFAULT_MESSAGE_LOGLEVEL + int "Default message log level (1-7)" + range 1 7 + default "4" + help + Default log level for printk statements with no specified priority. + + This was hard-coded to KERN_WARNING since at least 2.6.10 but folks + that are auditing their logs closely may want to set it to a lower + priority. + config ENABLE_WARN_DEPRECATED bool "Enable __deprecated logic" default y