Merge git://git.infradead.org/embedded-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jul 2008 19:02:08 +0000 (12:02 -0700)
* git://git.infradead.org/embedded-2.6:
  Make console charset translation optional

1  2 
drivers/char/Kconfig
drivers/char/Makefile
drivers/char/vt.c

Simple merge
Simple merge
Simple merge