tree c44fd3cf1c20c5724e719a3339a5734f2eae7e58
parent 86adf8adfcb3d3f4b6c30aeb40da480da02de1d1
parent 8f04915532485d81e7f6c580a396ea7b01094221
author Linus Torvalds <torvalds@linux-foundation.org> 1233631217 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233631217 -0800

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