diff options
| author | John W. Linville <[email protected]> | 2013-02-18 18:47:13 +0000 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2013-02-18 18:47:13 +0000 |
| commit | 98d5fac2330779e6eea6431a90b44c7476260dcc (patch) | |
| tree | 99870656d835fc6c12093bc67517956cc7b3d6ec /drivers/net/xen-netback/interface.c | |
| parent | tg3: Use different macros for pci_chip_rev_id accesses (diff) | |
| parent | Merge branch 'for-linville' of git://github.com/kvalo/ath6kl (diff) | |
| download | kernel-98d5fac2330779e6eea6431a90b44c7476260dcc.tar.gz kernel-98d5fac2330779e6eea6431a90b44c7476260dcc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions