tree 9d84938e61970fcd56830009911e9b39b7eee478
parent 45c448a1c0bed9c7eab6064493a7c5d94defcafd
parent b76aabc3956e9b95e7b7dc1aeecb8c6caf57f74c
author Roland Dreier <rolandd@cisco.com> 1252642785 -0700
committer Roland Dreier <rolandd@cisco.com> 1252642785 -0700

Merge branch 'mad' into for-linus

Conflicts:
	drivers/infiniband/core/mad.c