commit 5279585ff2bedc8180da5bdf8aa3ff1736466de2 Merge: 68b32d4... 9f3eefc... Author: Linus Torvalds Date: Sat Dec 13 11:32:24 2008 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx: powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia commit 68b32d4499fd910b85b263c3afe92687d18abc3f Merge: 8d9c02e... 2b895c3... Author: Linus Torvalds Date: Sat Dec 13 11:32:04 2008 -0800 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-highlander: Trivial endian casting fixes i2c-pmcmsp: Fix endianness misannotation commit 8d9c02ec76f228a8fed745725ad92d7bb3167859 Merge: fae1aa4... febd7a5... Author: Linus Torvalds Date: Sat Dec 13 11:28:13 2008 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: Commands needing to be retried require a complete re-initialization. commit fae1aa4a0bcfdd35735a38949650216aee964474 Merge: 1c55f18... 6d8a52d... Author: Linus Torvalds Date: Sat Dec 13 11:26:34 2008 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: IP32: Update defconfig MIPS: Add missing calls to plat_unmap_dma_mem. MIPS: Kconfig: Fix the arch-specific header path MIPS: Use EI/DI for MIPS R2. commit 1c55f18717304100a5f624c923f7cb6511b4116d Author: Ingo Brueckl Date: Wed Dec 10 23:35:00 2008 +0100 console ASCII glyph 1:1 mapping For the console, there is a 1:1 mapping of glyphs which cannot be found in the current font. This seems to be meant as a kind of 'emergency fallback' for fonts without unicode mapping which otherwise would display nothing readable on the screen. At the moment it affects all chars for which no substitution character is defined. In particular this means that for all chars (>= 128) where there is no iso88591-1/unicode character (e.g. control character area) you'll get the very strange 1:1 mapping of the (cp437) graphics card glyphs. I'm pretty sure that the 1:1 mapping should only affect strict ASCII code characters, i.e. chars < 128. The patch limits the mapping as it probably was meant anyway. Signed-off-by: Ingo Brueckl Acked-by: H. Peter Anvin Cc: Egmont Koblinger Signed-off-by: Linus Torvalds commit f75bc06e5d00a827d3ec5d57bbb5b73a4adec855 Author: Ingo Brueckl Date: Wed Dec 10 23:34:00 2008 +0100 unicode table for cp437 There is a major bug in the cp437 to unicode translation table. Char 0x7c is mapped to U+00a5 which is the Yen sign and wrong. The right mapping is U+00a6 (broken bar). Furthermore, a mapping for U+00b4 (a widely used character) is missing even though easily possible. The patch fixes these, as well as it provides a few other useful mappings. The changes are as follows: 0x0f (enhancement) enables a sort of currency symbol 0x27 (bug) enables a sort of acute accent which is a widely used character 0x44 (enhancement) enables a sort of icelandic capital letter eth 0x7c (major bug) corrects mapping 0xeb (enhancement) enables a sort of icelandic small letter eth 0xee (enhancement) enables a sort of math 'element of' Signed-off-by: Ingo Brueckl Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 6d8a52d7f09babf6cff1df32fe0b8ea47cf753f3 Author: David Daney Date: Wed Dec 10 15:27:13 2008 -0800 MIPS: IP32: Update defconfig Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 11531ac2d3f24c3dc4df3861d72d1e8b9b8b6317 Author: David Daney Date: Wed Dec 10 18:14:45 2008 -0800 MIPS: Add missing calls to plat_unmap_dma_mem. dma_free_noncoherent() and dma_free_coherent() are missing calls to plat_unmap_dma_mem(). This patch adds them. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 00ace207164cb414efba406830256721f45c1c62 Author: Dmitri Vorobiev Date: Wed Dec 10 22:38:36 2008 +0200 MIPS: Kconfig: Fix the arch-specific header path The header path in the help text for the RUNTIME_DEBUG config option is obsolete and needs to be updated to match the new location of architecture-specific header files. While at it, fix the spelling mistake. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit b6354db5bbbc538bf009cae6c019810b4a3ef21d Author: David Daney Date: Wed Dec 10 08:37:25 2008 -0800 MIPS: Use EI/DI for MIPS R2. For MIPS R2, use the EI and DI instructions to enable and disable interrupts. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit febd7a5c131433ea128b54dd5712e260c79eb3ab Author: Alan D. Brunelle Date: Tue Dec 9 15:52:15 2008 +0100 Commands needing to be retried require a complete re-initialization. The test-unit-ready portion of this patch was causing boots to fail on my test machine (as in http://lkml.org/lkml/2008/12/5/161). With this patch in place, the system is booting reliably. Mike Anderson found the same problem in the hp_hw_start_stop code, and I applied the same solution in cdrom_read_cdda_bpc. Signed-off-by: Alan D. Brunelle Cc: Mike Anderson Signed-off-by: Jens Axboe commit 9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5 Author: Josh Boyer Date: Tue Nov 25 06:33:35 2008 +0000 powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia The cuboot-acadia.c wrapper can cause assembler errors on some toolchains due to the lack of the proper BOOTCFLAGS. This adds the proper flags for the file. Signed-off-by: Josh Boyer commit 2b895c3f35d3ead0e9409b59da94094c7873f96d Author: Harvey Harrison Date: Thu Dec 11 12:11:21 2008 +0100 i2c-highlander: Trivial endian casting fixes Fixes sparse warnings: drivers/i2c/busses/i2c-highlander.c:95:26: warning: incorrect type in argument 1 (different base types) drivers/i2c/busses/i2c-highlander.c:95:26: expected restricted __be16 const [usertype] *p drivers/i2c/busses/i2c-highlander.c:95:26: got unsigned short [usertype] * drivers/i2c/busses/i2c-highlander.c:106:15: warning: incorrect type in assignment (different base types) drivers/i2c/busses/i2c-highlander.c:106:15: expected unsigned short [unsigned] [short] [usertype] drivers/i2c/busses/i2c-highlander.c:106:15: got restricted __be16 Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Cc: Ben Dooks Acked-by: Paul Mundt Signed-off-by: Jean Delvare commit d9d38ca07d5187b3082074934e73f014f5d31409 Author: Harvey Harrison Date: Thu Dec 11 12:11:20 2008 +0100 i2c-pmcmsp: Fix endianness misannotation tmp is used as host-endian and is loaded from a be64, fix the cast and the endian accessor used. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Cc: Ben Dooks Signed-off-by: Jean Delvare commit 6c34bc2976b30dc8b56392c020e25bae1f363cab Author: Linus Torvalds Date: Wed Dec 10 09:26:17 2008 -0800 Revert "radeonfb: accelerate imageblit and other improvements" This reverts commit b1ee26bab14886350ba12a5c10cbc0696ac679bf, along with the "fixes" for it that all just caused problems: - c4c6fa9891f3d1bcaae4f39fb751d5302965b566 "radeonfb: fix problem with color expansion & alignment" - f3179748a157c21d44d929fd3779421ebfbeaa93 "radeonfb: Disable new color expand acceleration unless explicitely enabled" because even when disabled, it breaks for people. See http://bugzilla.kernel.org/show_bug.cgi?id=12191 for the latest example. Acked-by: Benjamin Herrenschmidt Acked-by: David S. Miller Cc: Krzysztof Halasa Cc: James Cloos Cc: "Rafael J. Wysocki" Cc: Krzysztof Helt Cc: Jean-Luc Coulon Cc: Andrew Morton Signed-off-by: Linus Torvalds