@cisco.com> 1295241761 -0800
committer Roland Dreier <rolandd@cisco.com> 1295241761 -0800

Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next
u����4x