Merge branch 'linus'
commit9506b0a496f3b3006abd988bf687e0462d3d12bb
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Aug 2011 09:41:20 +0000 (17 11:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Aug 2011 09:41:20 +0000 (17 11:41 +0200)
tree31aa7269361406a36de0f35e1d1bf02e2ef39a4a
parentae75cbb495a488e3ce36e44c33587d6cb2e601b6
parentb5ddbf465f3675b19c8f5528b4064cbf278a5c6f
Merge branch 'linus'
Documentation/kernel-parameters.txt
fs/cifs/cifs_debug.c