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

* git://git.infradead.org/embedded-2.6:
  Make console charset translation optional