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)
commit73f526da0260db5376951373c267596993dc13a8
tree9d84938e61970fcd56830009911e9b39b7eee478
parent45c448a1c0bed9c7eab6064493a7c5d94defcafd
parentb76aabc3956e9b95e7b7dc1aeecb8c6caf57f74c
Merge branch 'mad' into for-linus

Conflicts:
drivers/infiniband/core/mad.c
drivers/infiniband/core/mad.c