Merge branches 'ehca' and 'mlx4' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Mon, 1 Dec 2008 18:11:50 +0000 (10:11 -0800)
committerRoland Dreier <rolandd@cisco.com>
Mon, 1 Dec 2008 18:11:50 +0000 (10:11 -0800)

Trivial merge