From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 10 Jul 2008 06:17:14 +0000 (+0200)
Subject: Merge branch 'linus' into core/printk
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e4144abf8a30ae221311368bbb10690ebdb4b76;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'linus' into core/printk

Conflicts:

	kernel/printk.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

9e4144abf8a30ae221311368bbb10690ebdb4b76