From: Jean-Marc Pigeon <jmp@kernel.safe.ca>
Date: Thu, 10 Jun 2010 20:22:51 +0000 (-0400)
Subject: Merge branch 'linus' into cont_syslog
X-Git-Tag: cont_sys_log_2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=19189faf4e846626dc963410347427b4f7cec286

Merge branch 'linus' into cont_syslog
---

19189faf4e846626dc963410347427b4f7cec286