tree 9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088
parent 352d4657b23fbd329efccc396000a549e0150907
parent bcf59e2c4dea780e4abf48d5e673f5d79f9ee064
author Linus Torvalds <torvalds@linux-foundation.org> 1269047662 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269047662 -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: remove duplicate cpu_to_le16()
  uwb: declare MODULE_FIRMWARE() in i1480 DFU driver
  uwb: make USB device id table constant
  uwb: wlp: refactor wlp_get_<attribute>() macros