Merge branch 'master' into for-next

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.

diff --cc MAINTAINERS
index 4d204e2a9754d8169a1295f0fbd6158c356f200c,6a588873cf8d2da8b00f803a1dcd8d96841292bd..510997499b59fa6ad0e7882379566a7089e0f600
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/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

diff --cc arch/arm/mach-omap2/pm24xx.c
index aa9764eeb94173a8456e2840d1aeca35521244da,aaeea49b9bdd80f6e51affaee9c3a38ff6e2368f..f3f3bfa230d7218d4a0cd4a87db660ac5fec0710
--- 1/arch/arm/mach-omap2/pm24xx.c
--- 2/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -326,7 -354,13 +354,13 @@@ static void omap2_pm_finish(void
        enable_hlt();
  }
  
 -static struct platform_suspend_ops omap_pm_ops = {
+ static void omap2_pm_end(void)
+ {
+       suspend_state = PM_SUSPEND_ON;
+ }
+ 
 +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,

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/mips/jz4740/board-qi_lb60.c
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

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

diff --cc drivers/atm/iphase.c
Simple merge

diff --cc drivers/base/power/main.c
Simple merge

diff --cc drivers/dma/intel_mid_dma.c
Simple merge

diff --cc drivers/edac/edac_core.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_backlight.c
Simple merge

diff --cc drivers/media/video/via-camera.c
Simple merge

diff --cc drivers/media/video/zoran/zoran.h
Simple merge

diff --cc drivers/message/fusion/mptsas.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/platform/x86/asus-laptop.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/platform/x86/toshiba_acpi.c
Simple merge

diff --cc drivers/scsi/a100u2w.c
Simple merge

diff --cc drivers/scsi/bfa/bfa_fcpim.c
index aabbf3d3b39474876c666d5a8404ca6c21e107aa,135c4427801cf66abc97719c6e9fe78ea6a9a8d1..cd7ef4818940a833b5ea8a48dd1240526fe356e8
--- 1/drivers/scsi/bfa/bfa_fcpim.c
--- 2/drivers/scsi/bfa/bfa_fcpim.c
+++ b/drivers/scsi/bfa/bfa_fcpim.c
@@@ -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;

diff --cc drivers/scsi/bfa/bfa_fcs_lport.c
Simple merge

diff --cc drivers/scsi/dc395x.c
Simple merge

diff --cc drivers/scsi/libfc/fc_fcp.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_hbadisc.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

diff --cc drivers/scsi/megaraid.h
Simple merge

diff --cc drivers/scsi/scsi_sysfs.c
Simple merge

diff --cc drivers/scsi/sym53c8xx_2/sym_glue.c
Simple merge

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

diff --cc drivers/staging/olpc_dcon/olpc_dcon.c
Simple merge

diff --cc drivers/staging/samsung-laptop/samsung-laptop.c
Simple merge

diff --cc drivers/staging/stradis/stradis.c
Simple merge

diff --cc drivers/usb/misc/iowarrior.c
Simple merge

diff --cc drivers/usb/musb/musb_gadget.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_super.c
Simple merge

diff --cc kernel/debug/kdb/kdb_main.c
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/power/hibernate.c
Simple merge

diff --cc kernel/power/suspend.c
Simple merge

diff --cc kernel/power/swap.c
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

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

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/soc/codecs/max98088.c
Simple merge

diff --cc sound/soc/s3c24xx/smdk_spdif.c
Simple merge