tree 168d69f005bfa39c1c79f7b9f0516bc5865ab566
parent 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c
parent 7adce751ce79bcb6d0a591e6b94d76631c9a232c
author Linus Torvalds <torvalds@linux-foundation.org> 1291320656 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291320656 -0800

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:
  IB: Fix information leak in marshalling code
  IB/pack: Remove some unused code added by the IBoE patches
  IB/mlx4: Fix IBoE link state
  IB/mlx4: Fix IBoE reported link rate
  mlx4_core: Workaround firmware bug in query dev cap
  IB/mlx4: Fix memory ordering of VLAN insertion control bits
  MAINTAINERS: Update NetEffect entry