Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:35:41 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:35:46 +0000 (16:35 -0700)
commiteba966a4e780199e31e8fd1d21bc9d187b1c9eaf
tree9197d7ac5022217c7d441b425cbbd245e6a19746
parentecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6
parentae5d82cb8d600989338bbda5ea38f5c0ff47175a
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: build UWB before USB/WUSB
drivers/Makefile