From: Russell King Date: Sat, 5 Dec 2009 10:35:18 +0000 (+0000) Subject: Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into... X-Git-Tag: v2.6.33-rc1~384^2~2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e28edb723e64200554194da17617ee6e82de6690 Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel --- e28edb723e64200554194da17617ee6e82de6690 diff --cc MAINTAINERS index 7d4b5cc07ad8,88241154f4ce,c824b4d62754,16129e67678a,fa2a16def17a,16129e67678a,88241154f4ce,2c719e1fca71..6150c80bccf6 --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@@@@ -107,12 -73,38 -107,12 -107,12 -73,39 -107,12 -73,38 -107,12 +107,12 @@@@@@@@@ Note: For the hard of thinking, this li order. If you could add yourselves to it in alphabetical order that would be so much easier [Ed] - - P: Person (obsolete) - - M: Mail patches to: FullName - P: Person - M: Mail patches to - - - L: Mailing list that is relevant to this area - - - W: Web-page with status/info - - - T: SCM tree type and location. Type is one of: git, hg, quilt, stgit. - - - S: Status, one of the following: - - - - - - Supported: Someone is actually paid to look after this. - - - Maintained: Someone actually looks after it. - - - Odd Fixes: It has a maintainer but they don't have time to do - - - much other than throw the odd patch in. See below.. - - - Orphan: No current maintainer [but maybe you could take the - - - role as you write your new code]. - - - Obsolete: Old code. Something tagged obsolete generally means - - - it has been replaced by a better system and you - - - should be using that. + + + Maintainers List (try to look for most precise areas first) - - - F: Files and directories with wildcard patterns. - - - A trailing slash includes all files and subdirectory files. - - - F: drivers/net/ all files in and below drivers/net - - - F: drivers/net/* all files in drivers/net, but not below - - - F: */net/* all files in "any top level directory"/net - - - One pattern per line. Multiple F: lines acceptable. - - - X: Files and directories that are NOT maintained, same rules as F: - - - Files exclusions are tested before file matches. - - - Can be useful for excluding a specific subdirectory, for instance: - - - F: net/ - - - X: net/ipv6/ - - - matches all files in and below net excluding net/ipv6/ + + + ----------------------------------- 3C505 NETWORK DRIVER - P: Philip Blundell - M: philb@gnu.org + M: Philip Blundell L: netdev@vger.kernel.org S: Maintained F: drivers/net/3c505* @@@@@@@@@ -177,12 -169,12 -177,12 -177,12 -180,15 -177,12 -169,12 -177,12 +177,12 @@@@@@@@@ F: drivers/net/*8390 F: drivers/net/ax88796.c 9P FILE SYSTEM - P: Eric Van Hensbergen - M: ericvh@gmail.com - P: Ron Minnich - M: rminnich@sandia.gov - P: Latchesar Ionkov - M: lucho@ionkov.net + M: Eric Van Hensbergen + M: Ron Minnich + M: Latchesar Ionkov L: v9fs-developer@lists.sourceforge.net W: http://swik.net/v9fs - - - T: git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git + + + T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git S: Maintained F: Documentation/filesystems/9p.txt F: fs/9p/ @@@@@@@@@ -532,15 -508,9 -516,9 -532,15 -570,10 -532,15 -508,9 -516,9 +532,15 @@@@@@@@@ ARM PRIMECELL MMCI PL180/1 DRIVE S: Orphan F: drivers/mmc/host/mmci.* ++ + ++ARM PRIMECELL BUS SUPPORT ++ + ++M: Russell King ++ + ++S: Maintained ++ + ++F: drivers/amba/ ++ + ++F: include/linux/amba/bus.h ++ + ++ ARM/ADI ROADRUNNER MACHINE SUPPORT - P: Lennert Buytenhek - M: kernel@wantstofly.org - L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) + M: Lennert Buytenhek + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-ixp23xx/ F: arch/arm/mach-ixp23xx/include/mach/ @@@@@@@@@ -768,19 -738,11 -746,11 -768,11 -791,13 -768,11 -738,11 -746,11 +768,19 @@@@@@@@@ F: arch/arm/mach-pxa/mioa701. S: Maintained ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT - P: Michael Petchkovsky - M: mkpetch@internode.on.net + M: Michael Petchkovsky S: Maintained +++++++ARM/NOMADIK ARCHITECTURE +++++++M: Alessandro Rubini +++++++M: STEricsson +++++++L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +++++++S: Maintained +++++++F: arch/arm/mach-nomadik/ +++++++F: arch/arm/plat-nomadik/ +++++++ ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT - P: Nelson Castillo - M: arhuaco@freaks-unidos.net + M: Nelson Castillo L: openmoko-kernel@lists.openmoko.org (subscribers-only) W: http://wiki.openmoko.org/wiki/Neo_FreeRunner S: Supported @@@@@@@@@ -923,9 -885,9 -893,9 -915,9 -900,10 -915,9 -885,9 -893,15 +923,15 @@@@@@@@@ L: linux-arm-kernel@lists.infradead.or W: http://www.mcuos.com S: Maintained +++++++ ARM/U8500 ARM ARCHITECTURE +++++++ M: Srinidhi Kasagar +++++++ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +++++++ S: Maintained +++++++ F: arch/arm/mach-ux500/ +++++++ ARM/VFP SUPPORT - P: Russell King - M: linux@arm.linux.org.uk - L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) + M: Russell King + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/vfp/ @@@@@@@@@ -1028,8 -991,8 -998,8 -1020,8 -1019,9 -1020,8 -991,8 -1004,8 +1034,8 @@@@@@@@@ S: Maintaine F: drivers/net/atlx/ ATM - P: Chas Williams - M: chas@cmf.nrl.navy.mil - L: linux-atm-general@lists.sourceforge.net (subscribers-only) + M: Chas Williams - - L: linux-atm-general@lists.sourceforge.net (subscribers-only) + + + L: linux-atm-general@lists.sourceforge.net (moderated for non-subscribers) L: netdev@vger.kernel.org W: http://linux-atm.sourceforge.net S: Maintained @@@@@@@@@ -1056,8 -1019,8 -1026,8 -1048,8 -1051,9 -1048,8 -1019,8 -1032,8 +1062,8 @@@@@@@@@ S: Supporte F: drivers/serial/atmel_serial.c ATMEL LCDFB DRIVER - P: Nicolas Ferre - M: nicolas.ferre@atmel.com - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Nicolas Ferre -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/atmel_lcdfb.c F: include/video/atmel_lcdc.h @@@@@@@@@ -1273,14 -1236,15 -1243,14 -1265,14 -1303,9 -1265,14 -1236,15 -1249,14 +1279,14 @@@@@@@@@ L: netdev@vger.kernel.or S: Supported F: drivers/net/tg3.* + BROCADE BFA FC SCSI DRIVER - - P: Jing Huang - - M: huangj@brocade.com - - L: linux-scsi@vger.kernel.org - - S: Supported - - F: drivers/scsi/bfa/ + + + M: Jing Huang + + + L: linux-scsi@vger.kernel.org + + + S: Supported + + + F: drivers/scsi/bfa/ + BSG (block layer generic sg v4 driver) - P: FUJITA Tomonori - M: fujita.tomonori@lab.ntt.co.jp + M: FUJITA Tomonori L: linux-scsi@vger.kernel.org S: Supported F: block/bsg.c @@@@@@@@@ -1515,8 -1479,7 -1485,8 -1507,8 -1581,8 -1507,8 -1479,7 -1491,8 +1521,8 @@@@@@@@@ F: kernel/cgroup F: mm/*cgroup* CORETEMP HARDWARE MONITORING DRIVER - P: Rudolf Marek - M: r.marek@assembler.cz + M: Rudolf Marek + + + M: Huaxu Wan L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp @@@@@@@@@ -2165,9 -2128,9 -2135,9 -2157,9 -2334,10 -2157,9 -2128,9 -2141,9 +2171,9 @@@@@@@@@ S: Maintaine F: drivers/i2c/busses/i2c-cpm.c FREESCALE IMX / MXC FRAMEBUFFER DRIVER - P: Sascha Hauer - M: kernel@pengutronix.de - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) - L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) + M: Sascha Hauer -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/plat-mxc/include/mach/imxfb.h F: drivers/video/imxfb.c @@@@@@@@@ -2188,8 -2151,8 -2158,8 -2180,8 -2361,9 -2180,8 -2151,8 -2164,8 +2194,8 @@@@@@@@@ S: Supporte F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h - - FREESCALE USB PERIPHERIAL DRIVERS - FREESCALE HIGHSPEED USB DEVICE DRIVER - P: Li Yang - M: leoli@freescale.com + + + FREESCALE USB PERIPHERAL DRIVERS + M: Li Yang L: linux-usb@vger.kernel.org L: linuxppc-dev@ozlabs.org S: Maintained @@@@@@@@@ -2239,8 -2202,20 -2209,8 -2231,8 -2420,19 -2231,8 -2202,20 -2215,8 +2245,8 @@@@@@@@@ F: Documentation/filesystems/caching F: fs/fscache/ F: include/linux/fscache*.h - - TRACING - - M: Steven Rostedt - - M: Frederic Weisbecker - - M: Ingo Molnar - - T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core - FTRACE - P: Steven Rostedt - M: rostedt@goodmis.org - - - S: Maintained - - - F: Documentation/trace/ftrace.txt - - - F: arch/*/*/*/ftrace.h - - - F: arch/*/kernel/ftrace.c - - F: include/*/ftrace.h include/trace/ include/linux/trace*.h - F: include/*/ftrace.h - - - F: kernel/trace/ - - - FUJITSU FR-V (FRV) PORT - P: David Howells - M: dhowells@redhat.com + M: David Howells S: Maintained F: arch/frv/ @@@@@@@@@ -2296,14 -2271,15 -2266,14 -2288,14 -2495,9 -2288,14 -2271,15 -2272,14 +2302,14 @@@@@@@@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: include/asm-generic + GENERIC UIO DRIVER FOR PCI DEVICES - - M: Michael S. Tsirkin + + + M: "Michael S. Tsirkin" + L: kvm@vger.kernel.org - - L: linux-kernel@vger.kernel.org + S: Supported + F: drivers/uio/uio_pci_generic.c + GFS2 FILE SYSTEM - P: Steven Whitehouse - M: swhiteho@redhat.com + M: Steven Whitehouse L: cluster-devel@redhat.com W: http://sources.redhat.com/cluster/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git @@@@@@@@@ -2342,15 -2318,8 -2312,8 -2334,15 -2540,9 -2334,15 -2318,8 -2318,8 +2348,15 @@@@@@@@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: drivers/media/video/gspca/finepix.c ++ + ++GSPCA GL860 SUBDRIVER ++ + ++M: Olivier Lorin ++ + ++L: linux-media@vger.kernel.org ++ + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git ++ + ++S: Maintained ++ + ++F: drivers/media/video/gspca/gl860/ ++ + ++ GSPCA M5602 SUBDRIVER - P: Erik Andren - M: erik.andren@gmail.com + M: Erik Andren L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git S: Maintained @@@@@@@@@ -2570,10 -2539,11 -2533,11 -2562,10 -2783,12 -2562,10 -2539,11 -2539,11 +2576,10 @@@@@@@@@ S: Maintaine F: Documentation/i2c/ F: drivers/i2c/ F: include/linux/i2c.h -- - --F: include/linux/i2c-dev.h -- - --F: include/linux/i2c-id.h ++ + ++F: include/linux/i2c-*.h I2C-TINY-USB DRIVER - P: Till Harbaum - M: till@harbaum.org + M: Till Harbaum L: linux-i2c@vger.kernel.org W: http://www.harbaum.org/till/i2c_tiny_usb S: Maintained @@@@@@@@@ -2705,15 -2675,15 -2669,15 -2697,15 -2941,17 -2697,15 -2675,15 -2675,15 +2711,15 @@@@@@@@@ S: Maintaine F: drivers/input/ INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) - P: Sylvain Meyer - M: sylvain.meyer@worldonline.fr - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Sylvain Meyer -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: Documentation/fb/intelfb.txt F: drivers/video/intelfb/ INTEL 810/815 FRAMEBUFFER DRIVER - P: Antonino Daplas - M: adaplas@gmail.com - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Antonino Daplas -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/i810/ @@@@@@@@@ -2858,8 -2828,8 -2822,8 -2850,8 -3129,9 -2850,8 -2828,8 -2828,8 +2864,8 @@@@@@@@@ S: Supporte F: drivers/infiniband/hw/ipath/ IPMI SUBSYSTEM - P: Corey Minyard - M: minyard@acm.org - L: openipmi-developer@lists.sourceforge.net + M: Corey Minyard - - L: openipmi-developer@lists.sourceforge.net + + + L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers) W: http://openipmi.sourceforge.net/ S: Supported F: Documentation/IPMI.txt @@@@@@@@@ -3033,13 -3003,13 -2997,13 -3025,13 -3329,16 -3025,13 -3003,13 -3003,13 +3039,13 @@@@@@@@@ F: Makefil F: scripts/Makefile.* KERNEL JANITORS - P: Several L: kernel-janitors@vger.kernel.org - - - W: http://www.kerneljanitors.org/ - - - S: Maintained + + + W: http://janitor.kernelnewbies.org/ + + + S: Odd Fixes KERNEL NFSD, SUNRPC, AND LOCKD SERVERS - P: J. Bruce Fields - M: bfields@fieldses.org - P: Neil Brown - M: neilb@suse.de + M: "J. Bruce Fields" + M: Neil Brown L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ S: Supported @@@@@@@@@ -3119,17 -3089,13 -3083,17 -3111,17 -3425,17 -3111,17 -3089,13 -3089,17 +3125,17 @@@@@@@@@ F: include/linux/kgdb. F: kernel/kgdb.c KMEMCHECK - P: Vegard Nossum - M: vegardno@ifi.uio.no - P Pekka Enberg - M: penberg@cs.helsinki.fi - L: linux-kernel@vger.kernel.org + M: Vegard Nossum - - P Pekka Enberg - - M: penberg@cs.helsinki.fi + + + M: Pekka Enberg S: Maintained + + + F: Documentation/kmemcheck.txt + + + F: arch/x86/include/asm/kmemcheck.h + + + F: arch/x86/mm/kmemcheck/ + + + F: include/linux/kmemcheck.h + + + F: mm/kmemcheck.c KMEMLEAK - P: Catalin Marinas - M: catalin.marinas@arm.com - L: linux-kernel@vger.kernel.org + M: Catalin Marinas S: Maintained F: Documentation/kmemleak.txt F: include/linux/kmemleak.h @@@@@@@@@ -3426,8 -3392,8 -3390,8 -3418,8 -3775,9 -3418,8 -3392,8 -3396,8 +3432,8 @@@@@@@@@ W: http://www.syskonnect.co S: Supported MATROX FRAMEBUFFER DRIVER - P: Petr Vandrovec - M: vandrove@vc.cvut.cz - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Petr Vandrovec -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/matrox/matroxfb_* F: include/linux/matroxfb.h @@@@@@@@@ -3656,7 -3622,7 -3620,7 -3648,7 -4044,6 -3648,7 -3622,7 -3626,7 +3662,7 @@@@@@@@@ L: netfilter@vger.kernel.or L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ - - T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git + + + T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git S: Supported F: include/linux/netfilter* F: include/linux/netfilter/ @@@@@@@@@ -3690,20 -3656,19 -3654,20 -3682,20 -4080,12 -3682,20 -3656,19 -3660,20 +3696,20 @@@@@@@@@ F: Documentation/blockdev/nbd.tx F: drivers/block/nbd.c F: include/linux/nbd.h + NETWORK DROP MONITOR + M: Neil Horman + L: netdev@vger.kernel.org + S: Maintained + W: https://fedorahosted.org/dropwatch/ + F: net/core/drop_monitor.c + NETWORKING [GENERAL] - P: David S. Miller - M: davem@davemloft.net + M: "David S. Miller" L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net + W: http://patchwork.ozlabs.org/project/netdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git + + + T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git S: Maintained F: net/ F: include/net/ @@@@@@@@@ -3813,14 -3778,14 -3777,14 -3805,14 -4204,16 -3805,14 -3778,14 -3783,14 +3819,14 @@@@@@@@@ F: Documentation/filesystems/ntfs.tx F: fs/ntfs/ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER - P: Antonino Daplas - M: adaplas@gmail.com - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Antonino Daplas -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/riva/ F: drivers/video/nvidia/ OMAP SUPPORT - - M: "Tony Lindgren " - P: Tony Lindgren - M: tony@atomide.com + + + M: Tony Lindgren L: linux-omap@vger.kernel.org W: http://www.muru.com/linux/omap/ W: http://linux.omap.com/ @@@@@@@@@ -3848,8 -3813,8 -3812,8 -3840,8 -4244,9 -3840,8 -3813,8 -3818,8 +3854,8 @@@@@@@@@ S: Maintaine F: sound/soc/omap/ OMAP FRAMEBUFFER SUPPORT - P: Imre Deak - M: imre.deak@nokia.com - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Imre Deak -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained F: drivers/video/omap/ @@@@@@@@@ -3925,17 -3890,8 -3889,17 -3917,17 -4328,9 -3917,17 -3890,8 -3895,17 +3931,17 @@@@@@@@@ S: Maintaine F: Documentation/i2c/busses/i2c-ocores F: drivers/i2c/busses/i2c-ocores.c + + + OPEN FIRMWARE AND FLATTENED DEVICE TREE + + + M: Grant Likely + + + L: devicetree-discuss@lists.ozlabs.org + + + W: http://fdt.secretlab.ca + + + S: Maintained + + + F: drivers/of + + + F: include/linux/of*.h + + + K: of_get_property + + + OPROFILE - P: Robert Richter - M: robert.richter@amd.com + M: Robert Richter L: oprofile-list@lists.sf.net S: Maintained F: arch/*/oprofile/ @@@@@@@@@ -4354,15 -4310,15 -4318,15 -4346,15 -4782,17 -4346,15 -4310,15 -4324,15 +4360,15 @@@@@@@@@ F: include/linux/qnx4_fs. F: include/linux/qnxtypes.h RADEON FRAMEBUFFER DISPLAY DRIVER - P: Benjamin Herrenschmidt - M: benh@kernel.crashing.org - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Benjamin Herrenschmidt -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/aty/radeon* F: include/linux/radeonfb.h RAGE128 FRAMEBUFFER DISPLAY DRIVER - P: Paul Mackerras - M: paulus@samba.org - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Paul Mackerras -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/aty/aty128fb.c @@@@@@@@@ -4454,10 -4408,10 -4418,10 -4446,10 -4895,11 -4446,10 -4408,10 -4424,10 +4460,10 @@@@@@@@@ S: Supporte F: fs/reiserfs/ RFKILL - P: Johannes Berg - M: johannes@sipsolutions.net + M: Johannes Berg L: linux-wireless@vger.kernel.org S: Maintained - - - F Documentation/rfkill.txt + + + F: Documentation/rfkill.txt F: net/rfkill/ RISCOM8 DRIVER @@@@@@@@@ -4500,8 -4454,8 -4464,8 -4492,8 -4947,9 -4492,8 -4454,8 -4470,8 +4506,8 @@@@@@@@@ S: Maintaine F: drivers/net/wireless/rtl818x/rtl8187* S3 SAVAGE FRAMEBUFFER DRIVER - P: Antonino Daplas - M: adaplas@gmail.com - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Antonino Daplas -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/savage/ @@@@@@@@@ -4579,15 -4533,16 -4543,15 -4571,15 -5041,9 -4571,15 -4533,16 -4549,15 +4585,15 @@@@@@@@@ S: Maintaine F: kernel/sched* F: include/linux/sched.h + SCORE ARCHITECTURE - - P: Chen Liqin - - M: liqin.chen@sunplusct.com - - P: Lennox Wu - - M: lennox.wu@gmail.com + + + M: Chen Liqin + + + M: Lennox Wu + W: http://www.sunplusct.com + S: Supported + + + F: arch/score/ + SCSI CDROM DRIVER - P: Jens Axboe - M: axboe@kernel.dk + M: Jens Axboe L: linux-scsi@vger.kernel.org W: http://www.kernel.dk S: Maintained @@@@@@@@@ -4657,27 -4612,27 -4621,27 -4649,27 -5122,31 -4649,27 -4612,27 -4627,27 +4663,27 @@@@@@@@@ S: Maintaine F: drivers/mmc/host/sdricoh_cs.c SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER - - S: Orphan - - L: linux-mmc@vger.kernel.org - - F: drivers/mmc/host/sdhci.* - P: Pierre Ossman - M: pierre@ossman.eu - L: sdhci-devel@lists.ossman.eu - S: Maintained + + + S: Orphan + + + L: linux-mmc@vger.kernel.org + + + F: drivers/mmc/host/sdhci.* SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) - P: Anton Vorontsov - M: avorontsov@ru.mvista.com + M: Anton Vorontsov L: linuxppc-dev@ozlabs.org - - L: linux-mmc@vger.kernel.org - L: sdhci-devel@lists.ossman.eu + + + L: linux-mmc@vger.kernel.org S: Maintained - - F: drivers/mmc/host/sdhci-of.* - F: drivers/mmc/host/sdhci.* + + + F: drivers/mmc/host/sdhci-of.* SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER - P: Ben Dooks - M: ben-linux@fluff.org - L: sdhci-devel@lists.ossman.eu + M: Ben Dooks - - L: linux-mmc@vger.kernel.org + + + L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-s3c.c SECURITY SUBSYSTEM - P: James Morris - M: jmorris@namei.org + M: James Morris L: linux-security-module@vger.kernel.org (suggested Cc:) - - - T: git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git + + + T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git W: http://security.wiki.kernel.org/ S: Supported F: security/ @@@@@@@@@ -4712,16 -4667,17 -4676,16 -4704,16 -5187,11 -4704,16 -4667,17 -4682,16 +4718,16 @@@@@@@@@ F: drivers/ata F: include/linux/ata.h F: include/linux/libata.h + SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER - - P: Jayamohan Kallickal - - M: jayamohank@serverengines.com - - L: linux-scsi@vger.kernel.org - - W: http://www.serverengines.com - - S: Supported - - F: drivers/scsi/be2iscsi/ + + + M: Jayamohan Kallickal + + + L: linux-scsi@vger.kernel.org + + + W: http://www.serverengines.com + + + S: Supported + + + F: drivers/scsi/be2iscsi/ + SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER - P: Sathya Perla - M: sathyap@serverengines.com - P: Subbu Seetharaman - M: subbus@serverengines.com + M: Sathya Perla + M: Subbu Seetharaman L: netdev@vger.kernel.org W: http://www.serverengines.com S: Supported @@@@@@@@@ -4771,15 -4727,16 -4735,15 -4763,15 -5246,12 -4763,15 -4727,16 -4741,15 +4777,15 @@@@@@@@@ F: drivers/serial/serial_lh7a40x. F: drivers/usb/gadget/lh7a40* F: drivers/usb/host/ohci-lh7a40* - SHPC HOTPLUG DRIVER - P: Kristen Carlson Accardi - M: kristen.c.accardi@intel.com - L: linux-pci@vger.kernel.org + SIMPLE FIRMWARE INTERFACE (SFI) - - P: Len Brown - - M: lenb@kernel.org + + + M: Len Brown + L: sfi-devel@simplefirmware.org + W: http://simplefirmware.org/ + T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git S: Supported - F: drivers/pci/hotplug/shpchp* + F: arch/x86/kernel/*sfi* + F: drivers/sfi/ + F: include/linux/sfi*.h SIMTEC EB110ATX (Chalice CATS) P: Ben Dooks @@@@@@@@@ -5220,29 -5177,15 -5184,29 -5212,29 -5746,11 -5212,29 -5177,15 -5190,29 +5226,29 @@@@@@@@@ L: tpmdd-devel@lists.sourceforge.net (m S: Maintained F: drivers/char/tpm/ + + + TRACING + + + M: Steven Rostedt + + + M: Frederic Weisbecker + + + M: Ingo Molnar + + + T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core + + + S: Maintained + + + F: Documentation/trace/ftrace.txt + + + F: arch/*/*/*/ftrace.h + + + F: arch/*/kernel/ftrace.c + + + F: include/*/ftrace.h + + + F: include/linux/trace*.h + + + F: include/trace/ + + + F: kernel/trace/ + + + TRIVIAL PATCHES - P: Jiri Kosina - M: trivial@kernel.org + M: Jiri Kosina T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git S: Maintained + + TTY LAYER + M: Greg Kroah-Hartman + S: Maintained + T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h @@@@@@@@@ -5663,8 -5606,8 -5627,8 -5655,8 -6235,9 -5655,8 -5606,8 -5633,8 +5669,8 @@@@@@@@@ T: git git://git.kernel.org/pub/scm/uti S: Maintained UVESAFB DRIVER - P: Michal Januszewski - M: spock@gentoo.org - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Michal Januszewski -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org W: http://dev.gentoo.org/~spock/projects/uvesafb/ S: Maintained F: Documentation/fb/uvesafb.txt @@@@@@@@@ -5695,9 -5638,9 -5659,9 -5687,9 -6273,11 -5687,9 -5638,9 -5665,9 +5701,9 @@@@@@@@@ S: Maintaine F: drivers/mmc/host/via-sdmmc.c VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER - P: Joseph Chan - M: JosephChan@via.com.tw - P: Scott Fang - M: ScottFang@viatech.com.cn - L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) + M: Joseph Chan + M: Scott Fang -- --L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) ++ + ++L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/via/ @@@@@@@@@ -5722,16 -5665,16 -5686,16 -5714,16 -6305,11 -5714,16 -5665,16 -5692,16 +5728,16 @@@@@@@@@ S: Maintaine F: drivers/vlynq/vlynq.c F: include/linux/vlynq.h + VMWARE VMXNET3 ETHERNET DRIVER - - M: Shreyas Bhatewara - - M: VMware, Inc. - - L: netdev@vger.kernel.org - - S: Maintained - - F: drivers/net/vmxnet3/ + + + M: Shreyas Bhatewara + + + M: "VMware, Inc." + + + L: netdev@vger.kernel.org + + + S: Maintained + + + F: drivers/net/vmxnet3/ + VOLTAGE AND CURRENT REGULATOR FRAMEWORK - P: Liam Girdwood - M: lrg@slimlogic.co.uk - P: Mark Brown - M: broonie@opensource.wolfsonmicro.com + M: Liam Girdwood + M: Mark Brown W: http://opensource.wolfsonmicro.com/node/15 W: http://www.slimlogic.co.uk/?p=48 T: git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git @@@@@@@@@ -5799,13 -5742,14 -5763,13 -5791,13 -6386,9 -5791,13 -5742,14 -5769,13 +5805,13 @@@@@@@@@ L: linux-scsi@vger.kernel.or S: Maintained F: drivers/scsi/wd7000.c + WINBOND CIR DRIVER - - P: David Härdeman - - M: david@hardeman.nu + + + M: David Härdeman + S: Maintained + F: drivers/input/misc/winbond-cir.c + WIMAX STACK - P: Inaky Perez-Gonzalez - M: inaky.perez-gonzalez@intel.com + M: Inaky Perez-Gonzalez M: linux-wimax@intel.com L: wimax@linuxwimax.org S: Supported @@@@@@@@@ -5856,26 -5800,28 -5820,26 -5848,26 -6427,9 -5848,26 -5800,28 -5826,26 +5862,26 @@@@@@@@@ S: Supporte F: drivers/input/touchscreen/*wm97* F: include/linux/wm97xx.h + WOLFSON MICROELECTRONICS PMIC DRIVERS - - P: Mark Brown - - M: broonie@opensource.wolfsonmicro.com - - L: linux-kernel@vger.kernel.org + + + M: Mark Brown + T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus + W: http://opensource.wolfsonmicro.com/node/8 + S: Supported + F: drivers/leds/leds-wm83*.c + F: drivers/mfd/wm8*.c + F: drivers/power/wm83*.c + F: drivers/rtc/rtc-wm83*.c + F: drivers/regulator/wm8*.c + F: drivers/video/backlight/wm83*_bl.c + F: drivers/watchdog/wm83*_wdt.c + F: include/linux/mfd/wm831x/ + F: include/linux/mfd/wm8350/ + F: include/linux/mfd/wm8400/ + F: sound/soc/codecs/wm8350.c + F: sound/soc/codecs/wm8400.c + X.25 NETWORK LAYER - P: Henner Eisen - M: eis@baty.hanse.de + M: Henner Eisen L: linux-x25@vger.kernel.org S: Maintained F: Documentation/networking/x25* diff --cc arch/arm/mach-at91/Kconfig index 2fd88437348b,7878e3312861,2fd88437348b,2fd88437348b,323b47f2b52f,2fd88437348b,e35d54d43e70,2fd88437348b..c71e39ed092f --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@@@@@@@@ -156,13 -156,18 -156,13 -156,13 -144,6 -156,13 -156,13 -156,13 +156,18 @@@@@@@@@ config MACH_YL920 help Select this if you are using the ucDragon YL-9200 board. + config MACH_CPUAT91 + bool "Eukrea CPUAT91" + depends on ARCH_AT91RM9200 + help + Select this if you are using the Eukrea Electromatique's + CPUAT91 board . + + ++++++config MACH_ECO920 + ++++++ bool "eco920" + ++++++ help + ++++++ Select this if you are using the eco920 board + ++++++ endif # ---------------------------------------------------------- @@@@@@@@@ -315,39 -327,30 -315,39 -315,39 -274,7 -315,39 -322,30 -315,39 +320,39 @@@@@@@@@ config MACH_AT91SAM9G20E bool "Atmel AT91SAM9G20-EK Evaluation Kit" depends on ARCH_AT91SAM9G20 help - - - Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit. + + + Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit + + + that embeds only one SD/MMC slot. + + + + + + config MACH_AT91SAM9G20EK_2MMC + + + bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" + + + depends on ARCH_AT91SAM9G20 + + + help + + + Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit + + + with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and + + + onwards. + + config MACH_CPU9G20 + bool "Eukrea CPU9G20 board" + depends on ARCH_AT91SAM9G20 + help + Select this if you are using a Eukrea Electromatique's + CPU9G20 Board + + endif + + # ---------------------------------------------------------- + + if ARCH_AT91SAM9G45 + + comment "AT91SAM9G45 Board Type" + + config MACH_AT91SAM9G45EKES + bool "Atmel AT91SAM9G45-EKES Evaluation Kit" + depends on ARCH_AT91SAM9G45 + help + Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit. + "ES" at the end of the name means that this board is an + Engineering Sample. endif @@@@@@@@@ -394,7 -397,7 -394,7 -394,7 -321,7 -394,7 -392,7 -394,7 +399,7 @@@@@@@@@ config MTD_AT91_DATAFLASH_CAR config MTD_NAND_ATMEL_BUSWIDTH_16 bool "Enable 16-bit data bus interface to NAND flash" - - depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK) - depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91CAP9ADK) + + + depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK) help On AT91SAM926x boards both types of NAND flash can be present (8 and 16 bit data bus width). diff --cc arch/arm/mach-at91/at91sam9g45_devices.c index 332b784050b2,003f4f91fa52,332b784050b2,332b784050b2,000000000000,332b784050b2,d581cff80c4c,332b784050b2..a57af3e99c7c mode 100644,100644,100644,100644,000000,100644,100644,100644..100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@@@@@@@@ -1,1334 -1,1390 -1,1334 -1,1334 -1,0 -1,1334 -1,1334 -1,1334 +1,1390 @@@@@@@@@ + /* + * On-Chip devices setup code for the AT91SAM9G45 family + * + * Copyright (C) 2009 Atmel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include + #include + + #include + #include + #include + + #include + #include