diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 15:30:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 15:30:48 (GMT) |
| commit | c55960499f810357a29659b32d6ea594abee9237 (patch) | |
| tree | b65748db925f7ec894e0b2cf8783609c6fbc88be /sound/oss/waveartist.c | |
| parent | fbaab1dc19751c80a7df62425f1d9ad2688e42f5 (diff) | |
| parent | 10c6c9c94c3eaadd7f9d6bafccc8709eda0da0f5 (diff) | |
| download | linux-fsl-qoriq-c55960499f810357a29659b32d6ea594abee9237.tar.xz | |
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/oss/waveartist.c')
0 files changed, 0 insertions, 0 deletions