Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
commit17294ab2ca8e8c46f2e4825c55541b2b88e52bf4
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:20:17 +0000 (2 19:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:20:17 +0000 (2 19:20 -0800)
treec44fd3cf1c20c5724e719a3339a5734f2eae7e58
parent86adf8adfcb3d3f4b6c30aeb40da480da02de1d1
parent8f04915532485d81e7f6c580a396ea7b01094221
Merge branch 'for-upstream' of git://git./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