diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 14:19:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 14:19:26 -0500 |
| commit | 9118626a30f8a3f58674623bebd3c34961e558af (patch) | |
| tree | 9dac3d8f95f82b84c39695a648ee3a718daba676 /drivers/mtd | |
| parent | aba99437f5af7a419a82438f7fab16bb3ddd9b44 (diff) | |
| parent | e51c7b1ab05d4a6fe4d153b2769290d37e077479 (diff) | |
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:
RDMA: Update missed conversion of flush_scheduled_work()
RDMA/ucma: Copy iWARP route information on queries
RDMA/amso1100: Fix compile warnings
RDMA/cxgb4: Set the correct device physical function for iWARP connections
RDMA/cxgb4: Limit MAXBURST EQ context field to 256B
IB/qib: Hold link for TX SERDES settings
mlx4_core: Add ConnectX-3 device IDs
Diffstat (limited to 'drivers/mtd')
0 files changed, 0 insertions, 0 deletions