summaryrefslogtreecommitdiffstats
path: root/sound/isa/sgalaxy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:30:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:30:48 -0700
commitc55960499f810357a29659b32d6ea594abee9237 (patch)
treeb65748db925f7ec894e0b2cf8783609c6fbc88be /sound/isa/sgalaxy.c
parentfbaab1dc19751c80a7df62425f1d9ad2688e42f5 (diff)
parent10c6c9c94c3eaadd7f9d6bafccc8709eda0da0f5 (diff)
downloadop-kernel-dev-c55960499f810357a29659b32d6ea594abee9237.zip
op-kernel-dev-c55960499f810357a29659b32d6ea594abee9237.tar.gz
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/isa/sgalaxy.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud