diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-13 22:58:59 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-13 22:59:09 (GMT) |
| commit | 98f1b7f3820a50a42e51f9bd3e7014cf9b2688a8 (patch) | |
| tree | 9a3797eb18583717861029f5ec7d3438135bcd06 /include/uapi/linux/ipv6.h | |
| parent | 926489be1d2b030c17d38fa10b5921bf3409d91d (diff) | |
| parent | 89c2af3c14ddf8ae48637a7b454d66ac5e0ca728 (diff) | |
| download | linux-fsl-qoriq-98f1b7f3820a50a42e51f9bd3e7014cf9b2688a8.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for 3.12. It is mostly driver
stuff, although Johannes Berg and Simon Wunderlich make a good
showing with mac80211 bits (particularly some work on 5/10 MHz
channel support).
The usual suspects are mostly represented. There are lots of updates
to iwlwifi, ath9k, ath10k, mwifiex, rt2x00, wil6210, as usual.
The bcma bus gets some love this time, as do cw1200, iwl4965, and a
few other bits here and there. I don't think there is much unusual
here, FWIW.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/ipv6.h')
0 files changed, 0 insertions, 0 deletions