Merge branches 'bkl-removal', 'ipoib', 'mlx4' and 'nes' into for-linus
Roland Dreier [Sat, 26 Jul 2008 20:59:47 +0000 (13:59 -0700)]

Trivial merge