diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-17 00:57:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-17 00:57:32 -0400 |
| commit | ba01dfe18241bf89b058fd8a60218b218ad2bb30 (patch) | |
| tree | 3fabfae4ae740e335c545c8967542f61ed4fd750 /drivers/nfc | |
| parent | e97563989a609296c3cbf5b6d8c8dc0a3e47b00b (diff) | |
| parent | 9316f0e3c6ba524d8fa14bfded048b252891931a (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is another batch of updates intended for the 3.7 stream.
There are not a lot of large items, but iwlwifi, mwifiex, rt2x00,
ath9k, and brcmfmac all get some attention. Wei Yongjun also provides
a series of small maintenance fixes.
This also includes a pull of the wireless tree in order to satisfy
some prerequisites for later patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions