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-Tag: v2.6.27-rc1~1098^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9e4144abf8a30ae221311368bbb10690ebdb4b76;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into core/printk

Conflicts:

	kernel/printk.c

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

9e4144abf8a30ae221311368bbb10690ebdb4b76