Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:18:56 +0000 (14:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:18:56 +0000 (14:18 -0800)
commit9917f7bbe96432012d3ad8075e9fd99390255d0c
tree4460ef91691044d4d5ee72061412b51f7d782d35
parentdd508ae2dbff0cfc7401eb6e278339fc56bc5033
parent355ffe69cb329bb9ab9eca3ebef369268162220d
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:
  MAINTAINERS: update entries for WUSB, UWB and WLP subsystems