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)
commitff5d48a6d18d09bb750d1f89f6464f5fdb6fc85b
tree243a2157912d6183c99d98dc74fe7a87a5cfbf6e
parent762b8291be6944bd891fbe2c8976a2b2e5bbc726
parenta29ccf6f823a84d89e1c7aaaf221cf7282022024
Merge git://git.infradead.org/embedded-2.6

* git://git.infradead.org/embedded-2.6:
  Make console charset translation optional
drivers/char/Kconfig
drivers/char/Makefile
drivers/char/vt.c