Merge branch 'fixes-modulesplit' into fixes

diff --combined MAINTAINERS
index 03067f5,6388a96..9fb6bd9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1716,6 -1716,7 +1716,7 @@@ F:      include/linux/can.
  F:    include/linux/can/core.h
  F:    include/linux/can/bcm.h
  F:    include/linux/can/raw.h
+ F:    include/linux/can/gw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
@@@ -2386,7 -2387,7 +2387,7 @@@ F:      include/linux/netfilter_bridge/ebt_*
  F:    net/bridge/netfilter/ebt*.c
  
  ECRYPT FILE SYSTEM
- M:    Tyler Hicks <tyhicks@linux.vnet.ibm.com>
+ M:    Tyler Hicks <tyhicks@canonical.com>
  M:    Dustin Kirkland <kirkland@canonical.com>
  L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
@@@ -2467,8 -2468,6 +2468,6 @@@ L:      linux-edac@vger.kernel.or
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
- F:    drivers/edac/edac_mce.c
- F:    include/linux/edac_mce.h
  
  EDAC-I82975X
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
@@@ -2492,6 -2491,13 +2491,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
+ EDAC-SBRIDGE
+ M:    Mauro Carvalho Chehab <mchehab@redhat.com>
+ L:    linux-edac@vger.kernel.org
+ W:    bluesmoke.sourceforge.net
+ S:    Maintained
+ F:    drivers/edac/sb_edac.c
+ 
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -3013,6 -3019,13 +3019,13 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
+ HARDWARE SPINLOCK CORE
+ M:    Ohad Ben-Cohen <ohad@wizery.com>
+ S:    Maintained
+ F:    Documentation/hwspinlock.txt
+ F:    drivers/hwspinlock/hwspinlock_*
+ F:    include/linux/hwspinlock.h
+ 
  HARMONY SOUND DRIVER
  M:    Kyle McMartin <kyle@mcmartin.ca>
  L:    linux-parisc@vger.kernel.org
@@@ -3205,8 -3218,7 +3218,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <tony.luck@intel.com>
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-ia64@vger.kernel.org
- W:    http://www.ia64-linux.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  S:    Maintained
  F:    arch/ia64/
  
@@@ -4465,11 -4477,9 +4477,9 @@@ F:     Documentation/networking/vxge.tx
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER/IPTABLES/IPCHAINS
- P:    Rusty Russell
- P:    Marc Boucher
- P:    James Morris
  P:    Harald Welte
  P:    Jozsef Kadlecsik
+ M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netfilter-devel@vger.kernel.org
  L:    netfilter@vger.kernel.org
@@@ -4662,7 -4672,7 +4672,7 @@@ L:      linux-omap@vger.kernel.or
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
  
@@@ -4710,6 -4720,13 +4720,13 @@@ S:    Maintaine
  F:    drivers/video/omap2/
  F:    Documentation/arm/OMAP/DSS
  
+ OMAP HARDWARE SPINLOCK SUPPORT
+ M:    Ohad Ben-Cohen <ohad@wizery.com>
+ L:    linux-omap@vger.kernel.org
+ S:    Maintained
+ F:    drivers/hwspinlock/omap_hwspinlock.c
+ F:    arch/arm/mach-omap2/hwspinlock.c
+ 
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
@@@ -6683,7 -6700,6 +6700,6 @@@ F:      drivers/net/ethernet/8390/ne-h8300.
  
  UDF FILESYSTEM
  M:    Jan Kara <jack@suse.cz>
- W:    http://linux-udf.sourceforge.net
  S:    Maintained
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/

diff --combined arch/arm/plat-omap/omap_device.c
index ef4ffc2,f839f94..e8d9869
--- 1/arch/arm/plat-omap/omap_device.c
--- 2/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@@ -78,6 -78,7 +78,7 @@@
  #undef DEBUG
  
  #include <linux/kernel.h>
+ #include <linux/export.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
  #include <linux/err.h>
@@@ -426,7 -427,7 +427,7 @@@ static int _omap_device_notifier_call(s
   * return the context loss counter for that hwmod, otherwise return
   * zero.
   */
 -u32 omap_device_get_context_loss_count(struct platform_device *pdev)
 +int omap_device_get_context_loss_count(struct platform_device *pdev)
  {
        struct omap_device *od;
        u32 ret = 0;