From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Sep 2012 03:17:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'scsi/for-next'
X-Git-Tag: next-20120917~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09daf27cf183934bafb86b09b9d3b959bb1092ae;p=karo-tx-linux.git

Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/scsi/qla2xxx/qla_nx.c
---

09daf27cf183934bafb86b09b9d3b959bb1092ae