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


Trivial merge