Merge branch 'master' into for-next
Jiri Kosina [Fri, 23 Apr 2010 00:08:44 +0000 (02:08 +0200)]
28 files changed:
1  2 
MAINTAINERS
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
drivers/acpi/osl.c
drivers/acpi/power.c
drivers/ata/ata_piix.c
drivers/char/bsr.c
drivers/firewire/ohci.c
drivers/gpu/drm/drm_bufs.c
drivers/gpu/drm/i915/intel_display.c
drivers/isdn/hardware/mISDN/hfcmulti.c
drivers/isdn/hisax/hfc4s8s_l1.c
drivers/net/ps3_gelic_wireless.c
drivers/net/smsc911x.c
drivers/pci/pci.c
drivers/regulator/core.c
drivers/rtc/rtc-stk17ta8.c
drivers/scsi/bfa/include/defs/bfa_defs_cee.h
drivers/scsi/bfa/include/defs/bfa_defs_status.h
drivers/spi/spi_mpc8xxx.c
drivers/usb/wusbcore/wa-xfer.c
drivers/virtio/virtio_pci.c
fs/jfs/jfs_dmap.c
fs/omfs/inode.c
include/linux/kfifo.h
kernel/cgroup.c
mm/memcontrol.c
net/ipv4/ipmr.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc 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>
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge