From: Linus Torvalds Date: Fri, 18 Feb 2011 01:51:52 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85;p=linux-beck.git 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/qib: Prevent double completions after a timeout or RNR error IB/qib: Fix double add_timer() RDMA/nes: Don't generate async events for unregistered devices --- dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85