commit f6760aa024199cfbce564311dc4bc4d47b6fb349 Merge: 90ea301 ea9d8e3 Author: Linus Torvalds Date: Sun Jan 24 10:38:07 2010 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clockevent: Don't remove broadcast device when cpu is dead commit 90ea301916688d010862395b00817f3c1c8e09a4 Merge: b8be634 4927fbf Author: Linus Torvalds Date: Sun Jan 24 10:37:51 2010 -0800 Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c: imx: call ioremap only after request_mem_region i2c: mxc: let time to generate stop bit commit b8be634e01b400fa2528848ad0cd6a5580a15bc4 Merge: 298a4c3 f5e2bae Author: Linus Torvalds Date: Sun Jan 24 10:31:34 2010 -0800 Merge git://git.infradead.org/~dwmw2/mtd-2.6.33 * git://git.infradead.org/~dwmw2/mtd-2.6.33: mtd: tests: fix read, speed and stress tests on NOR flash mtd: Really add ARM pismo support kmsg_dump: Dump on crash_kexec as well commit 4927fbf11dc1057cd9c94dd40358e5f98c999311 Author: Uwe Kleine-König Date: Fri Jan 8 17:23:17 2010 +0100 i2c: imx: call ioremap only after request_mem_region accordingly adapt order of release_mem_region and release_mem_region on remove. Signed-off-by: Uwe Kleine-König Cc: Ben Dooks Cc: Wolfram Sang Cc: Richard Zhao Cc: Darius Augulis Cc: Sascha Hauer Cc: linux-i2c@vger.kernel.org Acked-by: Wolfram Sang Signed-off-by: Ben Dooks commit a1ee06b72968d80ab9362ec61143c4f090cc2d1b Author: Valentin Longchamp Date: Thu Jan 21 18:55:32 2010 +0100 i2c: mxc: let time to generate stop bit After generating the stop bit by changing MSTA from 1 to 0, the i2c_imx->stopped was immediatly set to 1. The second test on i2c_imx->stopped then is correct and the controller never waits if the bus is busy. This patch corrects this. On mx31moboard, stop bit was not generated on single write transfers. This was kept unnoticed as other transfers are made afterwards that help the write recipient to resynchronize. Thanks to Philippe and Michael for the debugging. Signed-off-by: Valentin Longchamp Signed-off by: Philippe Rétornaz Reported-by: Michael Bonani Acked-by; Wolfram Sang Signed-off-by: Ben Dooks commit 298a4c3a57fed38df365a6807728d1930a72c728 Merge: 92dcffb 1619ce1 Author: Linus Torvalds Date: Thu Jan 21 17:33:23 2010 -0800 Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux * 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux: hmt: adjust for new pwm_backlight->notify prototype commit 1619ce111492d733d425acbacec9a2cb2ba16ed9 Author: Peter Korsgaard Date: Thu Jan 21 22:56:58 2010 +0100 hmt: adjust for new pwm_backlight->notify prototype Commit cfc38999f (backlight: Pass device through notify callback) added a struct device argument to the notify callback, but didn't update the user of it in mach-hmt.c Signed-off-by: Peter Korsgaard Signed-off-by: Ben Dooks commit ea9d8e3f45404d411c00ae67b45cc35c58265bb7 Author: Xiaotian Feng Date: Thu Jan 7 11:22:44 2010 +0800 clockevent: Don't remove broadcast device when cpu is dead Marc reported that the BUG_ON in clockevents_notify() triggers on his system. This happens because the kernel tries to remove an active clock event device (used for broadcasting) from the device list. The handling of devices which can be used as per cpu device and as a global broadcast device is suboptimal. The simplest solution for now (and for stable) is to check whether the device is used as global broadcast device, but this needs to be revisited. [ tglx: restored the cpuweight check and massaged the changelog ] Reported-by: Marc Dionne Tested-by: Marc Dionne Signed-off-by: Xiaotian Feng LKML-Reference: <1262834564-13033-1-git-send-email-dfeng@redhat.com> Signed-off-by: Thomas Gleixner Cc: stable@kernel.org commit f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba Author: Morten Thunberg Svendsen Date: Wed Jan 6 10:48:18 2010 +0100 mtd: tests: fix read, speed and stress tests on NOR flash Before using block_isbad() check if mtd->block_isbad() is defined. Calculating pgcnt must be done using pgsize defined to 512 on NOR and mtd->writesize for NAND, not using mtd->writesize directly. Signed-off-by: Morten Thunberg Svendsen Acked-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f6a8c60960bbea378142d1fa1b3d111555ee41c7 Author: Russell King - ARM Linux Date: Sun Nov 29 15:23:51 2009 +0000 mtd: Really add ARM pismo support (Commit 7cb777a3d71f9d1f7eb149c7a504d21f24219ae8 (mtd: add ARM pismo support) intended to add this, but seems only to have patched the Makefile without touching Kconfig or providing any code...) The following patch adds support for PISMO modules found on ARM Ltd development platforms. These are MTD modules, and can have a selection of SRAM, flash or DOC devices as described by an on-board I2C EEPROM. We support SRAM and NOR flash devices only by registering appropriate conventional MTD platform devices as children of the 'pismo' device. Signed-off-by: Russell King Signed-off-by: David Woodhouse commit 0f4bd46ec252887f44f1f065b41867cac8f70dfb Author: KOSAKI Motohiro Date: Tue Dec 22 03:15:43 2009 +0000 kmsg_dump: Dump on crash_kexec as well crash_kexec gets called before kmsg_dump(KMSG_DUMP_OOPS) if panic_on_oops is set, so the kernel log buffer is not stored for this case. This patch adds a KMSG_DUMP_KEXEC dump type which gets called when crash_kexec() is invoked. To avoid getting double dumps, the old KMSG_DUMP_PANIC is moved below crash_kexec(). The mtdoops driver is modified to handle KMSG_DUMP_KEXEC in the same way as a panic. Signed-off-by: KOSAKI Motohiro Acked-by: Simon Kagstrom Signed-off-by: David Woodhouse