tree e081135619ee146af5efb9ee883afca950df5757
parent 77d05632baee21b1cef8730d7c06aa69601e4dca
parent d508afb437daee7cf07da085b635c44a4ebf9b38
author Ingo Molnar <mingo@elte.hu> 1239095740 +0200
committer Ingo Molnar <mingo@elte.hu> 1239095740 +0200

Merge branch 'linus' into core/softlockup

Conflicts:
	kernel/sysctl.c