The following commit has been merged in the linux branch: commit e281e315f438093cbf27b4acdee364e781337a7a Merge: 49b766ec12650db38e98caafa3cd94e8ff59000c 371dc4a6d8c3c74a9a1c74b87c2affb3fcef6500 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:14:58 2009 -0700

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (it87) Fix VID reading on IT8718F/IT8720F hwmon: (dme1737) No vid attributes for SCH311x hwmon: (fschmd) Fix check on unsigned in watchdog_write() hwmon: (coretemp) Maintainer update

diff --combined MAINTAINERS index ece9f60,46a18ef..a1a2ace --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -65,51 -65,43 +65,51 @@@ trivial patch so apply some common sens

8. Happy hacking.

- ----------------------------------- - -Maintainers List (try to look for most precise areas first) +Descriptions of section entries: + + P: Person (obsolete) + M: Mail patches to: FullName address@domain + 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. + 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/ + K: Keyword perl extended regex pattern to match content in a + patch or file. For instance: + K: of_get_profile + matches patches or files that contain "of_get_profile" + K: \b(printk|pr_(info|err))\b + matches patches or files that contain one or more of the words + printk, pr_info or pr_err + One regex pattern per line. Multiple K: lines acceptable.

Note: For the hard of thinking, this list is meant to remain in alphabetical 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 address@domain -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 M: Philip Blundell philb@gnu.org @@@ -1000,7 -992,7 +1000,7 @@@ F: drivers/net/atlx

ATM M: Chas Williams chas@cmf.nrl.navy.mil -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 @@@ -1488,6 -1480,7 +1488,7 @@@ F: mm/*cgroup

CORETEMP HARDWARE MONITORING DRIVER M: Rudolf Marek r.marek@assembler.cz + M: Huaxu Wan huaxu.wan@intel.com L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp @@@ -2159,7 -2152,7 +2160,7 @@@ S: Supporte F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h

-FREESCALE USB PERIPHERIAL DRIVERS +FREESCALE USB PERIPHERAL DRIVERS M: Li Yang leoli@freescale.com L: linux-usb@vger.kernel.org L: linuxppc-dev@ozlabs.org @@@ -2210,6 -2203,18 +2211,6 @@@ F: Documentation/filesystems/caching F: fs/fscache/ F: include/linux/fscache*.h

-TRACING -M: Steven Rostedt rostedt@goodmis.org -M: Frederic Weisbecker fweisbec@gmail.com -M: Ingo Molnar mingo@redhat.com -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 include/trace/ include/linux/trace*.h -F: kernel/trace/ - FUJITSU FR-V (FRV) PORT M: David Howells dhowells@redhat.com S: Maintained @@@ -2268,8 -2273,9 +2269,8 @@@ S: Maintaine F: include/asm-generic

GENERIC UIO DRIVER FOR PCI DEVICES -M: Michael S. Tsirkin mst@redhat.com +M: "Michael S. Tsirkin" mst@redhat.com L: kvm@vger.kernel.org -L: linux-kernel@vger.kernel.org S: Supported F: drivers/uio/uio_pci_generic.c

@@@ -2999,8 -3005,8 +3000,8 @@@ F: scripts/Makefile.

KERNEL JANITORS 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 M: "J. Bruce Fields" bfields@fieldses.org @@@ -3780,7 -3786,7 +3781,7 @@@ F: drivers/video/riva F: drivers/video/nvidia/

OMAP SUPPORT -M: "Tony Lindgren tony@atomide.com" tony@atomide.com +M: Tony Lindgren tony@atomide.com L: linux-omap@vger.kernel.org W: http://www.muru.com/linux/omap/ W: http://linux.omap.com/ @@@ -3885,15 -3891,6 +3886,15 @@@ S: Maintaine F: Documentation/i2c/busses/i2c-ocores F: drivers/i2c/busses/i2c-ocores.c

+OPEN FIRMWARE AND FLATTENED DEVICE TREE +M: Grant Likely grant.likely@secretlab.ca +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 M: Robert Richter robert.richter@amd.com L: oprofile-list@lists.sf.net @@@ -4329,7 -4326,7 +4330,7 @@@ F: drivers/video/aty/aty128fb. RALINK RT2X00 WIRELESS LAN DRIVER P: rt2x00 project L: linux-wireless@vger.kernel.org -L: users@rt2x00.serialmonkey.com +L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) W: http://rt2x00.serialmonkey.com/ S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git @@@ -4538,11 -4535,12 +4539,11 @@@ 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 liqin.chen@sunplusct.com +M: Lennox Wu lennox.wu@gmail.com W: http://www.sunplusct.com S: Supported +F: arch/score/

SCSI CDROM DRIVER M: Jens Axboe axboe@kernel.dk @@@ -4615,20 -4613,20 +4616,20 @@@ 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.* +S: Orphan +L: linux-mmc@vger.kernel.org +F: drivers/mmc/host/sdhci.*

SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) M: Anton Vorontsov avorontsov@ru.mvista.com L: linuxppc-dev@ozlabs.org -L: linux-mmc@vger.kernel.org +L: linux-mmc@vger.kernel.org S: Maintained -F: drivers/mmc/host/sdhci-of.* +F: drivers/mmc/host/sdhci-of.*

SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER M: Ben Dooks ben-linux@fluff.org -L: linux-mmc@vger.kernel.org +L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-s3c.c

@@@ -4731,7 -4729,8 +4732,7 @@@ F: drivers/usb/gadget/lh7a40 F: drivers/usb/host/ohci-lh7a40*

SIMPLE FIRMWARE INTERFACE (SFI) -P: Len Brown -M: lenb@kernel.org +M: Len Brown lenb@kernel.org 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 @@@ -5179,20 -5178,6 +5180,20 @@@ L: tpmdd-devel@lists.sourceforge.net (m S: Maintained F: drivers/char/tpm/

+TRACING +M: Steven Rostedt rostedt@goodmis.org +M: Frederic Weisbecker fweisbec@gmail.com +M: Ingo Molnar mingo@redhat.com +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 M: Jiri Kosina trivial@kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git @@@ -5759,7 -5744,8 +5760,7 @@@ S: Maintaine F: drivers/scsi/wd7000.c

WINBOND CIR DRIVER -P: David H�rdeman -M: david@hardeman.nu +M: David Härdeman david@hardeman.nu S: Maintained F: drivers/input/misc/winbond-cir.c

@@@ -5816,7 -5802,9 +5817,7 @@@ 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 broonie@opensource.wolfsonmicro.com T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus W: http://opensource.wolfsonmicro.com/node/8 S: Supported