Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
[linux-2.6] / drivers / infiniband / hw /
drwxr-xr-x   ..
drwxr-xr-x - mthca