Merge branch 'master' into for-next

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/sibyte/bcm1480/irq.c
Simple merge

diff --cc arch/mips/sibyte/sb1250/irq.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/power.c
Simple merge

diff --cc drivers/ata/ata_piix.c
Simple merge

diff --cc drivers/char/bsr.c
Simple merge

diff --cc drivers/firewire/ohci.c
Simple merge

diff --cc drivers/gpu/drm/drm_bufs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/hfcmulti.c
Simple merge

diff --cc drivers/isdn/hisax/hfc4s8s_l1.c
Simple merge

diff --cc drivers/net/ps3_gelic_wireless.c
Simple merge

diff --cc drivers/net/smsc911x.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/rtc/rtc-stk17ta8.c
Simple merge

diff --cc drivers/scsi/bfa/include/defs/bfa_defs_cee.h
Simple merge

diff --cc drivers/scsi/bfa/include/defs/bfa_defs_status.h
index 03ce033,4374494..ec78b4c
--- 1/drivers/scsi/bfa/include/defs/bfa_defs_status.h
--- 2/drivers/scsi/bfa/include/defs/bfa_defs_status.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
@@@ -223,13 -223,12 +223,12 @@@ enum bfa_status 
        BFA_STATUS_IM_PVID_NON_ZERO = 140, /*  Port VLAN ID (PVID) is Set to
                                            * Non-Zero Value */
        BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /*  Acquiring Network
 -                                                * Subsytem Lock Failed.Please
 +                                                * Subsystem Lock Failed.Please
                                                  * try after some time */
 -      BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /*  Acquiring Network Subsytem
 +      BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /*  Acquiring Network Subsystem
                                                 * handle Failed. Please try
                                                 * after some time */
-       BFA_STATUS_IM_NOT_BOUND = 143, /*  Brocade 10G Ethernet Service is not
-                                       * Enabled on this port */
+       BFA_STATUS_IM_NOT_BOUND = 143, /*  IM driver is not active */
        BFA_STATUS_INSUFFICIENT_PERMS = 144, /*  User doesn't have sufficient
                                              * permissions to execute the BCU
                                              * application */

diff --cc drivers/spi/spi_mpc8xxx.c
Simple merge

diff --cc drivers/usb/wusbcore/wa-xfer.c
Simple merge

diff --cc drivers/virtio/virtio_pci.c
Simple merge

diff --cc fs/jfs/jfs_dmap.c
Simple merge

diff --cc fs/omfs/inode.c
index 2ff33ea,c82af6a..b44bb83
--- 1/fs/omfs/inode.c
--- 2/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@@ -3,8 -3,10 +3,9 @@@
   * Copyright (C) 2006 Bob Copeland <me@bobcopeland.com>
   * Released under GPL v2.
   */
 -#include <linux/version.h>
  #include <linux/module.h>
  #include <linux/sched.h>
+ #include <linux/slab.h>
  #include <linux/fs.h>
  #include <linux/vfs.h>
  #include <linux/parser.h>

diff --cc include/linux/kfifo.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge