Merge branch 'linus' into cont_syslog master cont_sys_log_2
authorJean-Marc Pigeon <jmp@kernel.safe.ca>
Thu, 10 Jun 2010 20:22:51 +0000 (16:22 -0400)
committerJean-Marc Pigeon <jmp@kernel.safe.ca>
Thu, 10 Jun 2010 20:22:51 +0000 (16:22 -0400)

Trivial merge