diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 19:28:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 19:28:54 -0700 |
| commit | 30c083c3da00a052211f8f73740f2b46974454a1 (patch) | |
| tree | 871bbd357f4a1fd0c2e9fd86e29b6a4629bf0613 /net/unix/af_unix.c | |
| parent | Merge git://git.infradead.org/users/cbou/battery-2.6.26 (diff) | |
| parent | IB/core: Remove IB_DEVICE_SEND_W_INV capability flag (diff) | |
| download | linux-dev-30c083c3da00a052211f8f73740f2b46974454a1.tar.xz linux-dev-30c083c3da00a052211f8f73740f2b46974454a1.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:
IB/core: Remove IB_DEVICE_SEND_W_INV capability flag
IB/umem: Avoid sign problems when demoting npages to integer
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions