Merge branch 'master'

author Steven Whitehouse <swhiteho@redhat.com>

Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)

committer Steven Whitehouse <swhiteho@redhat.com>

Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
author Steven Whitehouse <swhiteho@redhat.com>
Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
committer Steven Whitehouse <swhiteho@redhat.com>
Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Steven Whitehouse <swhiteho@redhat.com>
	Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
committer	Steven Whitehouse <swhiteho@redhat.com>
	Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history