Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Remove cpufreq_stats sysfs entries on module unload.
  MAINTAINERS: Update CPU FREQUENCY patterns

diff --combined MAINTAINERS
index e50fc6e,55d7b80..2cc3a94
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1739,7 -1739,7 +1739,7 @@@ S:      Supporte
  F:    drivers/net/enic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 +M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/arm/ep93xx_eth.c
@@@ -1889,7 -1889,6 +1889,6 @@@ L:      cpufreq@vger.kernel.or
  W:    http://www.codemonkey.org.uk/projects/cpufreq/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
  S:    Maintained
- F:    arch/x86/kernel/cpu/cpufreq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -4252,7 -4251,8 +4251,7 @@@ F:      drivers/mmc
  F:    include/linux/mmc/
  
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 -S:    Odd Fixes
 +S:    Orphan
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
@@@ -4602,6 -4602,7 +4601,6 @@@ F:      drivers/media/video/omap3isp/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <balbi@ti.com>
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -4945,7 -4946,6 +4944,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
  F:    drivers/video/fb-puv3.c
 +F:    drivers/rtc/rtc-puv3.c
  
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
@@@ -5983,6 -5983,7 +5982,6 @@@ F:      Documentation/serial/specialix.tx
  F:    drivers/staging/tty/specialix*
  
  SPI SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -6430,8 -6431,9 +6429,8 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6445,10 -6447,9 +6444,10 @@@ S:    Maintaine
  F:    drivers/media/video/et61x251/
  
  USB GADGET/PERIPHERAL SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/gadget
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/gadget/
  F:    include/linux/usb/gadget*
@@@ -6490,8 -6491,9 +6489,8 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*