Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 173 insertions, 102 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b444b0b5c772..8d1695811cfe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -155,16 +155,16 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 
 9P FILE SYSTEM
-P:      Eric Van Hensbergen
-M:      ericvh@gmail.com
-P:      Ron Minnich
-M:      rminnich@lanl.gov
-P:      Latchesar Ionkov
-M:      lucho@ionkov.net
-L:      v9fs-developer@lists.sourceforge.net
-W:      http://v9fs.sf.net
-T:      git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
-S:      Maintained
+P:      Eric Van Hensbergen
+M:      ericvh@gmail.com
+P:      Ron Minnich
+M:      rminnich@lanl.gov
+P:      Latchesar Ionkov
+M:      lucho@ionkov.net
+L:      v9fs-developer@lists.sourceforge.net
+W:      http://v9fs.sf.net
+T:      git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
+S:      Maintained
 
 A2232 SERIAL BOARD DRIVER
 P:      Enver Haase
@@ -290,8 +290,8 @@ M:	ink@jurassic.park.msu.ru
 S:      Maintained for 2.4; PCI support for 2.6.
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
-P:      Jordan Crouse
-M:      info-linux@geode.amd.com
+P:      Jordan Crouse
+M:      info-linux@geode.amd.com
 L:      info-linux@geode.amd.com
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
@@ -348,11 +348,24 @@ P:	Ian Molton
 M:      spyro@f2s.com
 S:      Maintained
 
+ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
+P:      Andrew Victor
+M:      andrew@sanpeople.com
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:      http://maxim.org.za/at91_26.html
+S:      Maintained
+
 ARM/CORGI MACHINE SUPPORT
 P:      Richard Purdie
 M:      rpurdie@rpsys.net
 S:      Maintained
 
+ARM/HP JORNADA 7XX MACHINE SUPPORT
+P:      Kristoffer Ericson
+M:      kristoffer_e1@hotmail.com
+W:      www.jlime.com
+S:      Maintained
+
 ARM/TOSA MACHINE SUPPORT
 P:      Dirk Opfer
 M:      dirk@opfer-online.de
@@ -426,6 +439,13 @@ L:	linux-atm-general@lists.sourceforge.net (subscribers-only)
 W:      http://linux-atm.sourceforge.net
 S:      Maintained
 
+ATMEL MACB ETHERNET DRIVER
+P:      Atmel AVR32 Support Team
+M:      avr32@atmel.com
+P:      Haavard Skinnemoen
+M:      hskinnemoen@atmel.com
+S:      Supported
+
 ATMEL WIRELESS DRIVER
 P:      Simon Kelley
 M:      simon@thekelleys.org.uk
@@ -493,7 +513,7 @@ S:	Maintained
 
 BFS FILE SYSTEM
 P:      Tigran A. Aivazian
-M:      tigran@veritas.com
+M:      tigran@aivazian.fsnet.co.uk
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -595,13 +615,13 @@ M:	maxk@qualcomm.com
 S:      Maintained
 
 BONDING DRIVER
-P:   Chad Tindel
-M:   ctindel@users.sourceforge.net
-P:   Jay Vosburgh
-M:   fubar@us.ibm.com
-L:   bonding-devel@lists.sourceforge.net
-W:   http://sourceforge.net/projects/bonding/
-S:   Supported
+P:      Chad Tindel
+M:      ctindel@users.sourceforge.net
+P:      Jay Vosburgh
+M:      fubar@us.ibm.com
+L:      bonding-devel@lists.sourceforge.net
+W:      http://sourceforge.net/projects/bonding/
+S:      Supported
 
 BROADBAND PROCESSOR ARCHITECTURE
 P:      Arnd Bergmann
@@ -664,7 +684,7 @@ S:	Supported
 CIRRUS LOGIC GENERIC FBDEV DRIVER
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Odd Fixes
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
@@ -738,8 +758,8 @@ W:	http://www.bullopensource.org/cpuset/
 S:      Supported
 
 CRAMFS FILESYSTEM
-W:     http://sourceforge.net/projects/cramfs/
-S:     Orphan
+W:      http://sourceforge.net/projects/cramfs/
+S:      Orphan
 
 CRIS PORT
 P:      Mikael Starvik
@@ -771,7 +791,7 @@ S:	Maintained
 CYBLAFB FRAMEBUFFER DRIVER
 P:      Knut Petersen
 M:      Knut_Petersen@t-online.de
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
@@ -1048,11 +1068,11 @@ W:	http://sourceforge.net/projects/emu10k1/
 S:      Maintained
 
 EMULEX LPFC FC SCSI DRIVER
-P:      James Smart
-M:      james.smart@emulex.com
-L:      linux-scsi@vger.kernel.org
-W:      http://sourceforge.net/projects/lpfcxxxx
-S:      Supported
+P:      James Smart
+M:      james.smart@emulex.com
+L:      linux-scsi@vger.kernel.org
+W:      http://sourceforge.net/projects/lpfcxxxx
+S:      Supported
 
 EPSON 1355 FRAMEBUFFER DRIVER
 P:      Christopher Hoover
@@ -1078,13 +1098,19 @@ M:	miku@iki.fi
 S:      Maintained
 
 EXT2 FILE SYSTEM
-L:      ext2-devel@lists.sourceforge.net
+L:      linux-ext4@vger.kernel.org
 S:      Maintained
 
 EXT3 FILE SYSTEM
 P:      Stephen Tweedie, Andrew Morton
 M:      sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
-L:      ext2-devel@lists.sourceforge.net
+L:      linux-ext4@vger.kernel.org
+S:      Maintained
+
+EXT4 FILE SYSTEM
+P:      Stephen Tweedie, Andrew Morton
+M:      sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
+L:      linux-ext4@vger.kernel.org
 S:      Maintained
 
 F71805F HARDWARE MONITORING DRIVER
@@ -1102,7 +1128,7 @@ S:	Supported
 FRAMEBUFFER LAYER
 P:      Antonino Daplas
 M:      adaplas@pol.net
-L:      linux-fbdev-devel@lists.sourceforge.net 
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 W:      http://linux-fbdev.sourceforge.net/
 S:      Maintained
 
@@ -1153,11 +1179,6 @@ P:	David Howells
 M:      dhowells@redhat.com
 S:      Maintained
 
-FTAPE/QIC-117
-L:      linux-tape@vger.kernel.org
-W:      http://sourceforge.net/projects/ftape
-S:      Orphan
-
 FUSE: FILESYSTEM IN USERSPACE
 P:      Miklos Szeredi
 M:      miklos@szeredi.hu
@@ -1206,7 +1227,8 @@ HARDWARE MONITORING
 P:      Jean Delvare
 M:      khali@linux-fr.org
 L:      lm-sensors@lm-sensors.org
-W:      http://www.lm-sensors.nu/
+W:      http://www.lm-sensors.org/
+T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/
 S:      Maintained
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
@@ -1332,8 +1354,7 @@ I2C SUBSYSTEM
 P:      Jean Delvare
 M:      khali@linux-fr.org
 L:      i2c@lm-sensors.org
-W:      http://www.lm-sensors.nu/
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
 S:      Maintained
 
 I2O
@@ -1458,7 +1479,7 @@ S:	Maintained
 IMS TWINTURBO FRAMEBUFFER DRIVER
 P:      Paul Mundt
 M:      lethal@chaoticdreams.org
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
 INFINIBAND SUBSYSTEM
@@ -1489,16 +1510,16 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
-P:      Sylvain Meyer
-M:      sylvain.meyer@worldonline.fr
-L:      linux-fbdev-devel@lists.sourceforge.net
-S:      Maintained
+P:      Sylvain Meyer
+M:      sylvain.meyer@worldonline.fr
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
 
 INTEL 810/815 FRAMEBUFFER DRIVER
-P:      Antonino Daplas
-M:      adaplas@pol.net
-L:      linux-fbdev-devel@lists.sourceforge.net
-S:      Maintained
+P:      Antonino Daplas
+M:      adaplas@pol.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
 
 INTEL APIC/IOAPIC, LOWLEVEL X86 SMP SUPPORT
 P:      Ingo Molnar
@@ -1513,7 +1534,7 @@ S:	Maintained
 
 INTEL IA32 MICROCODE UPDATE SUPPORT
 P:      Tigran Aivazian
-M:      tigran@veritas.com
+M:      tigran@aivazian.fsnet.co.uk
 S:      Maintained
 
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
@@ -1665,7 +1686,13 @@ S:	Supported
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 P:      Stephen Tweedie, Andrew Morton
 M:      sct@redhat.com, akpm@osdl.org
-L:      ext2-devel@lists.sourceforge.net
+L:      linux-ext4@vger.kernel.org
+S:      Maintained
+
+K8TEMP HARDWARE MONITORING DRIVER
+P:      Rudolf Marek
+M:      r.marek@assembler.cz
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 KCONFIG
@@ -1818,11 +1845,11 @@ L:	linuxppc-embedded@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
-P:     Kumar Gala
-M:     galak@kernel.crashing.org
-W:     http://www.penguinppc.org/
-L:     linuxppc-embedded@ozlabs.org
-S:     Maintained
+P:      Kumar Gala
+M:      galak@kernel.crashing.org
+W:      http://www.penguinppc.org/
+L:      linuxppc-embedded@ozlabs.org
+S:      Maintained
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 P:      Olof Johansson
@@ -1921,10 +1948,10 @@ W: 	http://www.syskonnect.com
 S:      Supported
 
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
-P: Michael Kerrisk
-M: mtk-manpages@gmx.net
-W: ftp://ftp.kernel.org/pub/linux/docs/manpages
-S: Maintained
+P:      Michael Kerrisk
+M:      mtk-manpages@gmx.net
+W:      ftp://ftp.kernel.org/pub/linux/docs/manpages
+S:      Maintained
 
 MARVELL MV643XX ETHERNET DRIVER
 P:      Dale Farnsworth
@@ -1937,15 +1964,15 @@ S:	Odd Fixes for 2.4; Maintained for 2.6.
 MATROX FRAMEBUFFER DRIVER
 P:      Petr Vandrovec
 M:      vandrove@vc.cvut.cz
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
 MEGARAID SCSI DRIVERS
-P:     Neela Syam Kolli
-M:     Neela.Kolli@engenio.com
-S:     linux-scsi@vger.kernel.org
-W:     http://megaraid.lsilogic.com
-S:     Maintained
+P:      Neela Syam Kolli
+M:      Neela.Kolli@engenio.com
+S:      linux-scsi@vger.kernel.org
+W:      http://megaraid.lsilogic.com
+S:      Maintained
 
 MEMORY MANAGEMENT
 L:      linux-mm@kvack.org
@@ -1998,6 +2025,12 @@ M:	rubini@ipvvis.unipv.it
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+MOXA SMARTIO/INDUSTIO SERIAL CARD (MXSER 2.0)
+P:      Jiri Slaby
+M:      jirislaby@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 MSI LAPTOP SUPPORT
 P:      Lennart Poettering
 M:      mzxreary@0pointer.de
@@ -2012,14 +2045,23 @@ L:	linux-kernel@vger.kernel.org
 W:      http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:      Maintained
 
-MULTIMEDIA CARD (MMC) SUBSYSTEM
-S:      Orphan
+MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM
+P:      Pierre Ossman
+M:      drzeus-mmc@drzeus.cx
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
 
 MULTISOUND SOUND DRIVER
 P:      Andrew Veliath
 M:      andrewtv@usa.net
 S:      Maintained
 
+MULTITECH MULTIPORT CARD (ISICOM)
+P:      Jiri Slaby
+M:      jirislaby@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 NATSEMI ETHERNET DRIVER (DP8381x)
 P:      Tim Hockin
 M:      thockin@hockin.org
@@ -2049,11 +2091,13 @@ P:	Marc Boucher
 P:      James Morris
 P:      Harald Welte
 P:      Jozsef Kadlecsik
-M:      coreteam@netfilter.org
+P:      Patrick McHardy
+M:      kaber@trash.net
+L:      netfilter-devel@lists.netfilter.org
+L:      netfilter@lists.netfilter.org
+L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
-L:      netfilter@lists.netfilter.org
-L:      netfilter-devel@lists.netfilter.org
 S:      Supported
 
 NETLABEL
@@ -2115,6 +2159,13 @@ L:	netdev@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
+NETXEN (1/10) GbE SUPPORT
+P:      Amit S. Kale
+M:      amitkale@netxen.com
+L:      netdev@vger.kernel.org
+W:      http://www.netxen.com
+S:      Supported
+
 IPVS
 P:      Wensong Zhang
 M:      wensong@linux-vs.org
@@ -2169,10 +2220,10 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
 S:      Maintained
 
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
-P:      Antonino Daplas
-M:      adaplas@pol.net
-L:      linux-fbdev-devel@lists.sourceforge.net
-S:      Maintained
+P:      Antonino Daplas
+M:      adaplas@pol.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
 
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
@@ -2304,8 +2355,8 @@ T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:      Supported
 
 PCI HOTPLUG CORE
-P:      Greg Kroah-Hartman
-M:      gregkh@suse.de
+P:      Kristen Carlson Accardi
+M:      kristen.c.accardi@intel.com
 S:      Supported
 
 PCI HOTPLUG COMPAQ DRIVER
@@ -2412,6 +2463,13 @@ M:	promise@pnd-pc.demon.co.uk
 W:      http://www.pnd-pc.demon.co.uk/promise/
 S:      Maintained
 
+PS3 PLATFORM SUPPORT
+P:      Geoff Levand
+M:      geoffrey.levand@am.sony.com
+L:      linuxppc-dev@ozlabs.org
+L:      cbe-oss-dev@ozlabs.org
+S:      Supported
+
 PVRUSB2 VIDEO4LINUX DRIVER
 P:      Mike Isely
 M:      isely@pobox.com
@@ -2448,13 +2506,13 @@ S:	Maintained
 RADEON FRAMEBUFFER DISPLAY DRIVER
 P:      Benjamin Herrenschmidt
 M:      benh@kernel.crashing.org
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 P:      Paul Mackerras
 M:      paulus@samba.org
-L:      linux-fbdev-devel@lists.sourceforge.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
@@ -2496,7 +2554,7 @@ S:	Maintained
 REAL TIME CLOCK (RTC) SUBSYSTEM
 P:      Alessandro Zummo
 M:      a.zummo@towertech.it
-L:      linux-kernel@vger.kernel.org
+L:      rtc-linux@googlegroups.com
 S:      Maintained
 
 REISERFS FILE SYSTEM
@@ -2522,10 +2580,10 @@ RISCOM8 DRIVER
 S:      Orphan
 
 S3 SAVAGE FRAMEBUFFER DRIVER
-P:      Antonino Daplas
-M:      adaplas@pol.net
-L:      linux-fbdev-devel@lists.sourceforge.net
-S:      Maintained
+P:      Antonino Daplas
+M:      adaplas@pol.net
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
 
 S390
 P:      Martin Schwidefsky
@@ -2606,10 +2664,10 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 
 SCTP PROTOCOL
-P: Sridhar Samudrala
-M: sri@us.ibm.com
-L: lksctp-developers@lists.sourceforge.net
-S: Supported
+P:      Sridhar Samudrala
+M:      sri@us.ibm.com
+L:      lksctp-developers@lists.sourceforge.net
+S:      Supported
 
 SCx200 CPU SUPPORT
 P:      Jim Cromie
@@ -2777,9 +2835,9 @@ L:	tpmdd-devel@lists.sourceforge.net
 S:      Maintained
 
 Telecom Clock Driver for MCPL0010
-P: Mark Gross
-M: mark.gross@intel.com
-S: Supported
+P:      Mark Gross
+M:      mark.gross@intel.com
+S:      Supported
 
 TENSILICA XTENSA PORT (xtensa):
 P:      Chris Zankel
@@ -2880,7 +2938,6 @@ S:	Maintained
 SUN3/3X
 P:      Sam Creasey
 M:      sammy@sammy.net
-L:      sun3-list@redhat.com
 W:      http://sammy.net/sun3/
 S:      Maintained
 
@@ -2926,9 +2983,9 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 TI PARALLEL LINK CABLE DRIVER
-P:     Romain Lievin
-M:     roms@lpg.ticalc.org
-S:     Maintained
+P:      Romain Lievin
+M:      roms@lpg.ticalc.org
+S:      Maintained
 
 TIPC NETWORK LAYER
 P:      Per Liden
@@ -2978,12 +3035,12 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 TRIVIAL PATCHES
-P:      Adrian Bunk
-M:      trivial@kernel.org
-L:      linux-kernel@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
-T:      git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
-S:      Maintained
+P:      Adrian Bunk
+M:      trivial@kernel.org
+L:      linux-kernel@vger.kernel.org
+W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
+T:      git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
+S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER
 P:      Adam Fritzler
@@ -3061,6 +3118,13 @@ L:	video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
 
+USB GADGET/PERIPHERAL SUBSYSTEM
+P:      David Brownell
+M:      dbrownell@users.sourceforge.net
+L:      linux-usb-devel@lists.sourceforge.net
+W:      http://www.linux-usb.org/gadget
+S:      Maintained
+
 USB HID/HIDBP DRIVERS
 P:      Vojtech Pavlik
 M:      vojtech@suse.cz
@@ -3244,10 +3308,11 @@ L:	linux-usb-users@lists.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
 S:      Maintained
 
-USB "USBNET" DRIVER
+USB "USBNET" DRIVER FRAMEWORK
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
+W:      http://www.linux-usb.org/usbnet
 S:      Maintained
 
 USB W996[87]CF DRIVER
@@ -3413,6 +3478,12 @@ W:	http://oss.sgi.com/projects/xfs
 T:      git git://oss.sgi.com:8090/xfs/xfs-2.6
 S:      Supported
 
+XILINX UARTLITE SERIAL DRIVER
+P:      Peter Korsgaard
+M:      jacmet@sunsite.dk
+L:      linux-serial@vger.kernel.org
+S:      Maintained
+
 X86 3-LEVEL PAGING (PAE) SUPPORT
 P:      Ingo Molnar
 M:      mingo@redhat.com