From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Mar 2010 01:14:22 +0000 (-0700)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b50df7d1fb37eb6aea87590b391d7111fde87121;p=mv-sheeva.git

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
---

b50df7d1fb37eb6aea87590b391d7111fde87121