From: Jeff Garzik Date: Thu, 23 Mar 2006 03:55:57 +0000 (-0500) Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: v2.6.17-rc1~994^2~12 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fa4fa40a990f8f4eff65476bef32007c154bbac0;p=~emulex%2Finfiniband.git Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 --- fa4fa40a990f8f4eff65476bef32007c154bbac0