Merge branches 'cma' and 'mlx4' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Tue, 30 Dec 2008 23:36:58 +0000 (15:36 -0800)
committerRoland Dreier <rolandd@cisco.com>
Tue, 30 Dec 2008 23:36:58 +0000 (15:36 -0800)

Trivial merge