Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp'...

author Roland Dreier <roland@purestorage.com>

Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)

committer Roland Dreier <roland@purestorage.com>

Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)
author Roland Dreier <roland@purestorage.com>
Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)
committer Roland Dreier <roland@purestorage.com>
Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)
diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)
committer	Roland Dreier <roland@purestorage.com>
	Tue, 26 Feb 2013 17:17:56 +0000 (09:17 -0800)