diff options
author | 2008-09-19 16:18:21 -0700 | |
---|---|---|
committer | 2008-09-19 16:18:21 -0700 | |
commit | 5a0cd4eb661fea095ff9962060c21c161a9ed43f (patch) | |
tree | 7e1e7a044fc9d04d2da246a58a52bd07c4e5fef0 /fs/xfs/linux-2.6/xfs_super.c | |
parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | Merge branches 'ipoib', 'mlx4' and 'nes' into for-linus (diff) | |
download | linux-dev-5a0cd4eb661fea095ff9962060c21c161a9ed43f.tar.xz linux-dev-5a0cd4eb661fea095ff9962060c21c161a9ed43f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Fix deadlock on RTNL between bcast join comp and ipoib_stop()
RDMA/nes: Fix client side QP destroy
IB/mlx4: Fix up fast register page list format
mlx4_core: Set RAE and init mtt_sz field in FRMR MPT entries
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
0 files changed, 0 insertions, 0 deletions