Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Mar 2010 01:14:22 +0000 (18:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Mar 2010 01:14:22 +0000 (18:14 -0700)
commitb50df7d1fb37eb6aea87590b391d7111fde87121
tree9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088
parent352d4657b23fbd329efccc396000a549e0150907
parentbcf59e2c4dea780e4abf48d5e673f5d79f9ee064
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: 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