]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'cxgb4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 28 Nov 2011 20:17:43 +0000 (12:17 -0800)
committerRoland Dreier <roland@purestorage.com>
Mon, 28 Nov 2011 20:17:43 +0000 (12:17 -0800)

Trivial merge