| commit | f702c5815696bfca095cc1173fff6995c4d39844 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 18 15:52:40 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 18 15:52:40 2008 -0800 |
| tree | f96bd0c4de6e12d06891bbd9760fe7bb213a3a60 | |
| parent | 0165d7f476b99eb637027c2f69c365f00260f188 [diff] | |
| parent | 51af33e8e45b845d8ee85446f58e31bc4c118048 [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/nes: Fix possible array overrun RDMA/nes: Fix VLAN support RDMA/nes: Fix MAC interrupt erroneously masked on ifdown IB: Fix return value in ib_device_register_sysfs()