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)
commit19189faf4e846626dc963410347427b4f7cec286
tree5cbc3667da6f8393e2887205a6742e534c2a39b6
parent7f95d48056f1569a9e97e78e6f1557c7172bf6ac
parent7908a9e5fc3f9a679b1777ed231a03636c068446
Merge branch 'linus' into cont_syslog