Merge git://git.infradead.org/embedded-2.6

author Linus Torvalds <[email protected]>

Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)

committer Linus Torvalds <[email protected]>

Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
author Linus Torvalds <[email protected]>
Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
committer Linus Torvalds <[email protected]>
Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/char/Makefile
Simple merge
diff --cc drivers/char/vt.c
Simple merge
author	Linus Torvalds <[email protected]>
	Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
committer	Linus Torvalds <[email protected]>
	Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
		1	2
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/vt.c	patch \|	diff1 \|	diff2 \|	blob \| history