diff options
| author |   Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
| commit | fe8875e5a41a36ef26072cf05731df5493ade0e1 (patch) | |
| tree | 786c31c1e86f5287177210fb469c8ecae0bdd146 /include/linux/blktrace_api.h | |
| parent | Merge branch 'srp' into for-next (diff) | |
| parent | IB/uverbs: Use anon_inodes instead of private infinibandeventfs (diff) | |
| download | wireguard-linux-fe8875e5a41a36ef26072cf05731df5493ade0e1.tar.xz wireguard-linux-fe8875e5a41a36ef26072cf05731df5493ade0e1.zip | |
Merge branch 'misc' into for-next
Conflicts:
drivers/infiniband/core/uverbs_main.c
Diffstat (limited to 'include/linux/blktrace_api.h')
0 files changed, 0 insertions, 0 deletions