]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Thu, 7 Aug 2008 21:12:03 +0000 (14:12 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 7 Aug 2008 21:12:03 +0000 (14:12 -0700)

Trivial merge