From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 22 Dec 2010 17:57:02 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4b7bd364700d9ac8372eff48832062b936d0793b;p=openwrt%2Fstaging%2Fblogic.git

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.
---

4b7bd364700d9ac8372eff48832062b936d0793b
diff --cc MAINTAINERS
index 4d204e2a9754,6a588873cf8d..510997499b59
--- a/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 aa9764eeb941,aaeea49b9bdd..f3f3bfa230d7
--- a/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 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,
diff --cc drivers/scsi/bfa/bfa_fcpim.c
index aabbf3d3b394,135c4427801c..cd7ef4818940
--- a/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;