Merge branch 'mad' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Fri, 11 Sep 2009 04:19:45 +0000 (21:19 -0700)
committerRoland Dreier <rolandd@cisco.com>
Fri, 11 Sep 2009 04:19:45 +0000 (21:19 -0700)
Conflicts:
drivers/infiniband/core/mad.c


Trivial merge