From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 2 Mar 2010 07:52:31 +0000 (-0800)
Subject: Merge branch 'misc' into for-next
X-Git-Tag: v2.6.34-rc1~225^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe8875e5a41a36ef26072cf05731df5493ade0e1;p=pandora-kernel.git

Merge branch 'misc' into for-next

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

fe8875e5a41a36ef26072cf05731df5493ade0e1
Reading git-diff-tree failed