Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus - wireguard-linux

diff options

author	Roland Dreier <roland@purestorage.com>	2012-05-21 09:00:47 -0700
committer	Roland Dreier <roland@purestorage.com>	2012-05-21 09:00:47 -0700
commit	cc169165c82e14ea43e313f937a0a475ca97e588 (patch)
tree	519721cccd2d91ecba43ef4f8879021c8858d8b7 /tools/perf/util/scripting-engines/trace-event-python.c
parent	IB/core: Fix IB_SA_COMP_MASK macro (diff)
parent	RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree (diff)
parent	IB/ipath: Replace open-coded ARRAY_SIZE with macro (diff)
parent	IB/iser: Fix error flow in iser ep connection establishment (diff)
parent	RDMA/cma: Fix lockdep false positive recursive locking (diff)
parent	IB/mlx4: Fix mlx4_ib_add() error flow (diff)
parent	RDMA/nes: Don't call event handler if pointer is NULL (diff)
parent	RDMA/ocrdma: Fix build with IPV6=n (diff)
parent	IB/qib: Add cache line awareness to qib_qp and qib_devdata structures (diff)
parent	IB/mlx4: Add raw packet QP support (diff)
download	wireguard-linux-cc169165c82e14ea43e313f937a0a475ca97e588.tar.xz wireguard-linux-cc169165c82e14ea43e313f937a0a475ca97e588.zip

Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus