Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
commit902c502f0b0efec3a784a8ef65057298025e5e11
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 26 Aug 2011 11:04:19 +0000 (26 08:04 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 26 Aug 2011 11:04:19 +0000 (26 08:04 -0300)
tree25feae940aefa94deec70ecffcab70670e8d14f6
parentef7c782ea4a99fafb3d60dc8b8c057e0ef14f9f7
parentb4ca46e4e82a0a5976fe5eab85be585d75f8202f
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6.git/

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Documentation/kernel-parameters.txt