Messages in this thread | | | From | Sujith Manoharan <> | Date | Wed, 26 Sep 2012 08:02:04 +0530 | Subject | linux-next: manual merge of the wireless-next tree with the pci tree |
| |
Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless-next tree got a conflict in > drivers/net/wireless/ath/ath9k/pci.c between commit 08bd108096b6 ("ath9k: > Use PCI Express Capability accessors") from the pci tree and commit > 046b6802c8d3 ("ath9k: Disable ASPM only for AR9285") from the > wireless-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
The fix looks good, thanks.
Sujith
| |