From: Linus Torvalds Date: Tue, 13 Apr 2010 01:37:34 +0000 (-0700) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.34-rc4~2 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=50b88c46f01939d19d4cdd30ad563d29265b6c59;hp=-c Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits) ARM: Fix ioremap_cached()/ioremap_wc() for SMP platforms ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock ARM: 6031/1: fix Thumb-2 decompressor ARM: 6029/1: ep93xx: gpio.c: local functions should be static ARM: 6028/1: ARM: add MAINTAINERS for U300 ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c MXC: mach_armadillo5x0: Add USB Host support. ARM mach-mx3: duplicated include ARM mach-mx3: duplicated include imx31: add watchdog device on litekit board. imx3: Add watchdog platform device support MXC: mach-mx31_3ds: add support for freescale mc13783 power management device. MXC: mach-mx31_3ds: Add SPI1 device support. MXC: mach-mx31_3ds: Add support for on board NAND Flash. MXC: mach-mx31_3ds: Update variable names over recent mach name modification. imx31: fix parent clock for rtc i.MX51: remove NFC AXI static mapping i.MX51: determine silicon revision dynamically i.MX51: map TZIC dynamically i.MX51: Use correct clock for gpt ... --- 50b88c46f01939d19d4cdd30ad563d29265b6c59 diff --combined MAINTAINERS index 7a9ccda2a307,6eb978ee321c..5b422908d0f3 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -971,6 -971,16 +971,16 @@@ L: linux-arm-kernel@lists.infradead.or W: http://www.mcuos.com S: Maintained + ARM/U300 MACHINE SUPPORT + M: Linus Walleij + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + S: Supported + F: arch/arm/mach-u300/ + F: drivers/i2c/busses/i2c-stu300.c + F: drivers/rtc/rtc-coh901331.c + F: drivers/watchdog/coh901327_wdt.c + F: drivers/dma/coh901318* + ARM/U8500 ARM ARCHITECTURE M: Srinidhi Kasagar L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -2474,6 -2484,12 +2484,6 @@@ L: linuxppc-dev@ozlabs.or S: Odd Fixes F: drivers/char/hvc_* -VIRTIO CONSOLE DRIVER -M: Amit Shah -L: virtualization@lists.linux-foundation.org -S: Maintained -F: drivers/char/virtio_console.c - iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER M: Peter Jones M: Konrad Rzeszutek Wilk @@@ -5965,13 -5981,6 +5975,13 @@@ S: Maintaine F: Documentation/filesystems/vfat.txt F: fs/fat/ +VIRTIO CONSOLE DRIVER +M: Amit Shah +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/char/virtio_console.c +F: include/linux/virtio_console.h + VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" L: kvm@vger.kernel.org