diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-16 13:23:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-16 13:23:45 -0800 |
commit | c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45 (patch) | |
tree | aa910b2c8a8dd7f80b6fe13c9a206136ddc078fc /mm | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
parent | IB/mthca: Use DEFINE_MUTEX() instead of mutex_init() (diff) | |
download | linux-dev-c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45.tar.xz linux-dev-c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45.zip |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mthca: Use DEFINE_MUTEX() instead of mutex_init()
IB/mthca: Add HCA profile module parameters
IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
IB: Fix ib_dma_alloc_coherent() wrapper
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions