diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-03 21:57:36 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-03 21:57:36 +0200 |
commit | 196896d4bb297e3ff24e62b2bfc22bbed7a28431 (patch) | |
tree | 4c8495abbcf9b6f769046a9b78df8588bf07504f /sound/oss/pas2_pcm.c | |
parent | Merge branch 'mv643xx' (diff) | |
parent | batman-adv: set up network coding packet handlers during module init (diff) | |
download | linux-196896d4bb297e3ff24e62b2bfc22bbed7a28431.tar.xz linux-196896d4bb297e3ff24e62b2bfc22bbed7a28431.zip |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Included change:
- fix multi soft-interfaces setups with Network Coding enabled by
registering the CODED packet type once only (instead of once per soft-if)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/oss/pas2_pcm.c')
0 files changed, 0 insertions, 0 deletions