From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Feb 2009 03:20:17 +0000 (-0800)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
X-Git-Tag: v2.6.29-rc4~72
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=17294ab2ca8e8c46f2e4825c55541b2b88e52bf4;p=~emulex%2Finfiniband.git

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: lock rc->rsvs_lock with spin_lock_bh()
  wusb: timeout when waiting for ASL/PZL updates in whci-hcd
  uwb: remove unused #include <version.h>'s
  wusb: return -ENOTCONN when resetting a port with no connected device
  uwb: safely remove all reservations
---

17294ab2ca8e8c46f2e4825c55541b2b88e52bf4