From: Roland Dreier <rolandd@cisco.com>
Date: Fri, 11 Sep 2009 04:19:45 +0000 (-0700)
Subject: Merge branch 'mad' into for-linus
X-Git-Tag: v2.6.32-rc1~736^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f526da0260db5376951373c267596993dc13a8;p=pandora-kernel.git

Merge branch 'mad' into for-linus

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

73f526da0260db5376951373c267596993dc13a8
Reading git-diff-tree failed