summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-02-05 18:45:25 +0100
committerRoland Dreier <roland@purestorage.com>2013-02-05 18:45:25 +0100
commitcbdba97a0f576cc2d958048ffedbe88948b67e03 (patch)
tree94fd2285cbfd2d433b88955db21bf8f2aabd661a
parentIPoIB: Fix crash due to skb double destruct (diff)
parentmlx4_core: Fix advertisement of wrong PF context behaviour (diff)
parentIB/qib: Fix for broken sparse warning fix (diff)
downloadlinux-cbdba97a0f576cc2d958048ffedbe88948b67e03.tar.xz
linux-cbdba97a0f576cc2d958048ffedbe88948b67e03.zip
Merge branches 'ipoib', 'mlx4' and 'qib' into for-next