summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 17:30:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 17:30:48 +0200
commitc55960499f810357a29659b32d6ea594abee9237 (patch)
treeb65748db925f7ec894e0b2cf8783609c6fbc88be /sound/soc/pxa
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg... (diff)
parentuwb: Orphan the UWB and WUSB subsystems (diff)
downloadlinux-c55960499f810357a29659b32d6ea594abee9237.tar.xz
linux-c55960499f810357a29659b32d6ea594abee9237.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: Orphan the UWB and WUSB subsystems uwb: Remove the WLP subsystem and drivers
Diffstat (limited to 'sound/soc/pxa')
0 files changed, 0 insertions, 0 deletions