diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 22:53:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 22:53:22 +0200 |
| commit | cf5046323ea254be72535648a9d090b18b8510f3 (patch) | |
| tree | d44894722bd965b2f28a54c4dc4157f22b618c34 /drivers/net/wimax/i2400m/sdio.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6 (diff) | |
| parent | Merge branches 'cxgb3', 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus (diff) | |
| download | linux-cf5046323ea254be72535648a9d090b18b8510f3.tar.xz linux-cf5046323ea254be72535648a9d090b18b8510f3.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Don't double-free IRQs when falling back from MSI-X to INTx
IB/mthca: Don't double-free IRQs when falling back from MSI-X to INTx
IB/mlx4: Add strong ordering to local inval and fast reg work requests
IB/ehca: Remove superfluous bitmasks from QP control block
RDMA/cxgb3: Limit fast register size based on T3 limitations
RDMA/cxgb3: Report correct port state and MTU
mlx4_core: Add module parameter for number of MTTs per segment
IB/mthca: Add module parameter for number of MTTs per segment
RDMA/nes: Fix off-by-one bugs in reset_adapter_ne020() and init_serdes()
infiniband: Remove void casts
IB/ehca: Increment version number
IB/ehca: Remove unnecessary memory operations for userspace queue pairs
IB/ehca: Fall back to vmalloc() for big allocations
IB/ehca: Replace vmalloc() with kmalloc() for queue allocation
Diffstat (limited to 'drivers/net/wimax/i2400m/sdio.c')
0 files changed, 0 insertions, 0 deletions