diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:07:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:07:00 -0800 |
| commit | ffaa60d5fe1d30b618b0feb22c79486c26a16ea0 (patch) | |
| tree | e4c2d26c7565c7cee36065753db09467a27e0339 /drivers/infiniband/hw/nes/nes_cm.c | |
| parent | efa82bab8e3509bb2c4a8044de5909b8bab96cfd (diff) | |
| parent | 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: Make cciss_seq_show handle holes in the h->drv[] array
cfq-iosched: split seeky coop queues after one slice
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_cm.c')
0 files changed, 0 insertions, 0 deletions