]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5f0adb 225c7b1)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 02:40:09 +0000 (19:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 02:40:09 +0000 (19:40 -0700)
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters
  IB: Put rlimit accounting struct in struct ib_umem
  IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules

1  2 
drivers/net/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
Linux 2.6 source tree