Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / infiniband / hw /
drwxr-xr-x   ..
drwxr-xr-x - mthca