diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 09:24:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 09:24:49 -0700 |
| commit | 83e0c24a38aa91f7d932bbcab257093b82435074 (patch) | |
| tree | eb0516fd12599e88e85bb1e63473548cbdc85540 /drivers/net/dm9000.c | |
| parent | 161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288 (diff) | |
| parent | 42ece6c1f8162cd782b44dc4863679e888531df5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
snd-pcsp: silent misleading warning
snd-pcsp: depend on CONFIG_EXPERIMENTAL
snd-pcsp: put back the compatibility code for the older alsa-libs
snd-pcsp: adjust help texts to frighten users
Diffstat (limited to 'drivers/net/dm9000.c')
0 files changed, 0 insertions, 0 deletions