Merge git://git.infradead.org/~dwmw2/mtd-2.6.33

author Linus Torvalds <[email protected]>

Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)

committer Linus Torvalds <[email protected]>

Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
author Linus Torvalds <[email protected]>
Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
committer Linus Torvalds <[email protected]>
Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
diff --cc kernel/kexec.c
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Linus Torvalds <[email protected]>
	Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
committer	Linus Torvalds <[email protected]>
	Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
		1	2
kernel/kexec.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history