diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-14 04:59:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 04:59:44 +0200 |
| commit | 5c16807d3d196203d2d3c9fae51ac7e422091904 (patch) | |
| tree | 850c33533f80fe426b477c4660c61ba22315a808 /sound/soc | |
| parent | bonding: wipe out printk's (diff) | |
| parent | netxen: free napi resources during detach (diff) | |
| download | linux-5c16807d3d196203d2d3c9fae51ac7e422091904.tar.xz linux-5c16807d3d196203d2d3c9fae51ac7e422091904.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'sound/soc')
0 files changed, 0 insertions, 0 deletions