From: Roland Dreier Date: Mon, 24 Oct 2005 17:55:29 +0000 (-0700) Subject: Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c) X-Git-Tag: v2.6.15-rc1~731^2~21^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec329a135974f1c400214dab02f09584d4beeba9;p=pandora-kernel.git Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c) --- ec329a135974f1c400214dab02f09584d4beeba9 Reading git-diff-tree failed