diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-25 18:49:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-25 18:49:17 +0100 |
| commit | 24bc518a6888e4c97add5a5ebbff11c1ccac219f (patch) | |
| tree | d125270f4e8432cebcbc8af9079dece51dd798a0 /drivers/firmware | |
| parent | net/macb: GEM DMA configuration register update (diff) | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff) | |
| download | linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.tar.xz linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firmware')
0 files changed, 0 insertions, 0 deletions