From: David S. Miller Date: Tue, 30 Aug 2011 21:43:56 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 X-Git-Tag: v3.1-rc7~25^2~12^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=785824165508a65478474f0c87f6b8c3ad048c62;p=~emulex%2Finfiniband.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 --- 785824165508a65478474f0c87f6b8c3ad048c62