aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:14:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:14:22 -0700
commitb50df7d1fb37eb6aea87590b391d7111fde87121 (patch)
tree9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088 /arch/sh
parent352d4657b23fbd329efccc396000a549e0150907 (diff)
parentbcf59e2c4dea780e4abf48d5e673f5d79f9ee064 (diff)
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 'arch/sh')
0 files changed, 0 insertions, 0 deletions