tree 9197d7ac5022217c7d441b425cbbd245e6a19746
parent ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6
parent ae5d82cb8d600989338bbda5ea38f5c0ff47175a
author Linus Torvalds <torvalds@linux-foundation.org> 1225064141 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225064146 -0700

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: build UWB before USB/WUSB