Merge branch 'master' into for-next
Jiri Kosina [Wed, 22 Dec 2010 17:57:02 +0000 (18:57 +0100)]
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

52 files changed:
1  2 
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/serial.c
arch/mips/jz4740/board-qi_lb60.c
arch/x86/kernel/head_32.S
drivers/acpi/sleep.c
drivers/atm/iphase.c
drivers/base/power/main.c
drivers/dma/intel_mid_dma.c
drivers/edac/edac_core.h
drivers/gpu/drm/nouveau/nouveau_backlight.c
drivers/media/video/via-camera.c
drivers/media/video/zoran/zoran.h
drivers/message/fusion/mptsas.c
drivers/net/bnx2x/bnx2x_main.c
drivers/net/e1000/e1000_main.c
drivers/platform/x86/asus-laptop.c
drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/toshiba_acpi.c
drivers/scsi/a100u2w.c
drivers/scsi/bfa/bfa_fcpim.c
drivers/scsi/bfa/bfa_fcs_lport.c
drivers/scsi/dc395x.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/lpfc/lpfc_hbadisc.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/megaraid.h
drivers/scsi/scsi_sysfs.c
drivers/scsi/sym53c8xx_2/sym_glue.c
drivers/spi/atmel_spi.c
drivers/staging/olpc_dcon/olpc_dcon.c
drivers/staging/samsung-laptop/samsung-laptop.c
drivers/staging/stradis/stradis.c
drivers/usb/misc/iowarrior.c
drivers/usb/musb/musb_gadget.c
fs/ext4/ext4.h
fs/ext4/inode.c
fs/xfs/linux-2.6/xfs_super.c
kernel/debug/kdb/kdb_main.c
kernel/perf_event.c
kernel/power/hibernate.c
kernel/power/suspend.c
kernel/power/swap.c
kernel/sched.c
mm/page_alloc.c
net/core/dev.c
net/ipv4/tcp_output.c
sound/core/pcm_native.c
sound/soc/codecs/max98088.c
sound/soc/s3c24xx/smdk_spdif.c

diff --cc MAINTAINERS
@@@ -6612,8 -6634,8 +6634,8 @@@ F:      drivers/xen/*swiotlb
  XEN HYPERVISOR INTERFACE
  M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
- L:    xen-devel@lists.xen.org
+ L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 -L:    virtualization@lists.osdl.org
 +L:    virtualization@lists.linux-foundation.org
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -326,7 -354,13 +354,13 @@@ static void omap2_pm_finish(void
        enable_hlt();
  }
  
+ static void omap2_pm_end(void)
+ {
+       suspend_state = PM_SUSPEND_ON;
+ }
 -static struct platform_suspend_ops omap_pm_ops = {
 +static const struct platform_suspend_ops omap_pm_ops = {
+       .begin          = omap2_pm_begin,
        .prepare        = omap2_pm_prepare,
        .enter          = omap2_pm_enter,
        .finish         = omap2_pm_finish,
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
Simple merge
Simple merge
@@@ -2091,8 -2091,8 +2091,8 @@@ bfa_ioim_sm_cleanup_qfull(struct bfa_io
                break;
  
        case BFA_IOIM_SM_ABORT:
-               /**
+               /*
 -               * IO is alraedy being cleaned up implicitly
 +               * IO is already being cleaned up implicitly
                 */
                ioim->io_cbfn = __bfa_cb_ioim_abort;
                break;
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
diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge