summaryrefslogtreecommitdiffstats
path: root/include/net/garp.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-20 02:14:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-20 02:14:22 +0100
commitb50df7d1fb37eb6aea87590b391d7111fde87121 (patch)
tree9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088 /include/net/garp.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mat... (diff)
parentuwb: remove duplicate cpu_to_le16() (diff)
downloadlinux-b50df7d1fb37eb6aea87590b391d7111fde87121.tar.xz
linux-b50df7d1fb37eb6aea87590b391d7111fde87121.zip
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
Diffstat (limited to 'include/net/garp.h')
0 files changed, 0 insertions, 0 deletions