From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2009 23:05:42 +0000 (-0700)
Subject: Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc1~657
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6671de344cd661453bbee3cfde5574a974332436;hp=-c

Merge branch 'timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  posix timers: fix RLIMIT_CPU && fork()
  time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix
  time: ntp: clean up second_overflow()
  time: ntp: simplify ntp_tick_adj calculations
  time: ntp: make 64-bit constants more robust
  time: ntp: refactor do_adjtimex() some more
  time: ntp: refactor do_adjtimex()
  time: ntp: fix bug in ntp_update_offset() & do_adjtimex()
  time: ntp: micro-optimize ntp_update_offset()
  time: ntp: simplify ntp_update_offset_fll()
  time: ntp: refactor and clean up ntp_update_offset()
  time: ntp: refactor up ntp_update_frequency()
  time: ntp: clean up ntp_update_frequency()
  time: ntp: simplify the MAX_TICKADJ_SCALED definition
  time: ntp: simplify the second_overflow() code flow
  time: ntp: clean up kernel/time/ntp.c
  x86: hpet: stop HPET_COUNTER when programming periodic mode
  x86: hpet: provide separate functions to stop and start the counter
  x86: hpet: print HPET registers during setup (if hpet=verbose is used)
  time: apply NTP frequency/tick changes immediately
  ...
---

6671de344cd661453bbee3cfde5574a974332436
diff --combined Documentation/kernel-parameters.txt
index 954b23cecfd1,46d11a95236e..fa4e1239a8fa
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -44,7 -44,6 +44,7 @@@ parameter is applicable
  	FB	The frame buffer device is enabled.
  	HW	Appropriate hardware is enabled.
  	IA-64	IA-64 architecture is enabled.
 +	IMA     Integrity measurement architecture is enabled.
  	IOSCHED	More than one I/O scheduler is enabled.
  	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.
  	ISAPNP	ISA PnP code is enabled.
@@@ -493,10 -492,12 +493,12 @@@ and is between 256 and 4096 characters
  			Default: 64
  
  	hpet=		[X86-32,HPET] option to control HPET usage
- 			Format: { enable (default) | disable | force }
+ 			Format: { enable (default) | disable | force |
+ 				verbose }
  			disable: disable HPET and use PIT instead
  			force: allow force enabled of undocumented chips (ICH4,
  			VIA, nVidia)
+ 			verbose: show contents of HPET registers during setup
  
  	com20020=	[HW,NET] ARCnet - COM20020 chipset
  			Format:
@@@ -830,9 -831,6 +832,9 @@@
  
  	hvc_iucv=	[S390] Number of z/VM IUCV hypervisor console (HVC)
  			       terminal devices. Valid values: 0..8
 +	hvc_iucv_allow=	[S390] Comma-separated list of z/VM user IDs.
 +			       If specified, z/VM IUCV HVC accepts connections
 +			       from listed z/VM user IDs only.
  
  	i8042.debug	[HW] Toggle i8042 debug mode
  	i8042.direct	[HW] Put keyboard port into non-translated mode
@@@ -906,15 -904,6 +908,15 @@@
  	ihash_entries=	[KNL]
  			Set number of hash buckets for inode cache.
  
 +	ima_audit=	[IMA]
 +			Format: { "0" | "1" }
 +			0 -- integrity auditing messages. (Default)
 +			1 -- enable informational integrity auditing messages.
 +
 +	ima_hash=	[IMA]
 +			Formt: { "sha1" | "md5" }
 +			default: "sha1"
 +
  	in2000=		[HW,SCSI]
  			See header of drivers/scsi/in2000.c.
  
@@@ -1829,6 -1818,11 +1831,6 @@@
  			autoconfiguration.
  			Ranges are in pairs (memory base and size).
  
 -	dynamic_printk	Enables pr_debug()/dev_dbg() calls if
 -			CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled.
 -			These can also be switched on/off via
 -			<debugfs>/dynamic_printk/modules
 -
  	print-fatal-signals=
  			[KNL] debug: print fatal signals
  			print-fatal-signals=1: print segfault info to