]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 762b829 a29ccf6)
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 patch | diff1 | diff2 | blob | history
drivers/char/Makefile patch | diff1 | diff2 | blob | history
drivers/char/vt.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/char/Makefile
Simple merge
diff --cc drivers/char/vt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.