From: Linus Torvalds Date: Wed, 11 Jul 2012 19:15:15 +0000 (-0700) Subject: Merge tag 'driver-core-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: upstream/snapshot3+hdmi~7104 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3dc352c02fa73728531765b4ca0f671c1e3be171;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'driver-core-3.5-rc6' of git://git./linux/kernel/git/gregkh/driver-core Pull printk fixes from Greg Kroah-Hartman: "Here are some more printk fixes for 3.5-rc6. They resolve all known outstanding issues with the printk changes that have been happening. They have been tested by the people reporting the problems. This hopefully should be it for the printk stuff for 3.5-final. Signed-off-by: Greg Kroah-Hartman " * tag 'driver-core-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: kmsg: merge continuation records while printing kmsg: /proc/kmsg - support reading of partial log records kmsg: make sure all messages reach a newly registered boot console kmsg: properly handle concurrent non-blocking read() from /proc/kmsg kmsg: add the facility number to the syslog prefix kmsg: escape the backslash character while exporting data printk: replacing the raw_spin_lock/unlock with raw_spin_lock/unlock_irq --- 3dc352c02fa73728531765b4ca0f671c1e3be171