| commit | ec329a135974f1c400214dab02f09584d4beeba9 | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <rolandd@cisco.com> | Mon Oct 24 10:55:29 2005 -0700 |
| committer | Roland Dreier <rolandd@cisco.com> | Mon Oct 24 10:55:29 2005 -0700 |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 [diff] | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 [diff] |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)