diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-17 00:49:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-17 00:49:02 -0400 |
| commit | e97563989a609296c3cbf5b6d8c8dc0a3e47b00b (patch) | |
| tree | 7db7e277af689757e597bddf3704ce60f8d5727b /drivers/net/wireless/ath/ath9k/ani.c | |
| parent | b48b63a1f6e26b0dec2c9f1690396ed4bcb66903 (diff) | |
| parent | 4ffdf91a5feae6f0f1486d038fcbba461345fa62 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jerr Kirsher says:
> This series contains updates to igb (specifically PTP code).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ani.c')
0 files changed, 0 insertions, 0 deletions