diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 16:08:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 16:08:59 -0700 |
commit | f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295 (patch) | |
tree | 8d6d56189526b50041abaef8aa308d0e72aca91a /include/asm-sparc64/fbio.h | |
parent | a8051fde6b71ac9a0e63c861c81c59ba776175f9 (diff) | |
parent | fb77bcef9f7be78e3e11543cb5abbcb1b1fac53e (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:
IB/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path
Diffstat (limited to 'include/asm-sparc64/fbio.h')
0 files changed, 0 insertions, 0 deletions