Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 15:30:48 +0000 (08:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 15:30:48 +0000 (08:30 -0700)
commitc55960499f810357a29659b32d6ea594abee9237
treeb65748db925f7ec894e0b2cf8783609c6fbc88be
parentfbaab1dc19751c80a7df62425f1d9ad2688e42f5
parent10c6c9c94c3eaadd7f9d6bafccc8709eda0da0f5
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: Orphan the UWB and WUSB subsystems
  uwb: Remove the WLP subsystem and drivers
MAINTAINERS