summaryrefslogtreecommitdiff
path: root/include/linux/nfs_fs_i.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-10-17 20:14:29 (GMT)
committerDavid S. Miller <davem@davemloft.net>2013-10-17 20:14:29 (GMT)
commit5cda73b68ebf7e08586d61e6777e64e12df23f07 (patch)
tree54e7d4409f96e519a6e1ef4ff2a057785df5f6f1 /include/linux/nfs_fs_i.h
parent0baf2b35fc70ab16c385963d2502da26a55d2cb7 (diff)
parent9f96da4dd2ccf685b506a21104cb13b1aadd907a (diff)
downloadlinux-fsl-qoriq-5cda73b68ebf7e08586d61e6777e64e12df23f07.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 the 3.13 stream... The biggest item of interest in here is wcn36xx, the new mac80211 driver for Qualcomm WCN3660/WCN3680 hardware. Regarding the mac80211 bits, Johannes says: "We have an assortment of cleanups and new features, of which the biggest one is probably the channel-switch support in IBSS. Nothing else really stands out much." On top of that, the ath9k and rt2x00 get a lot of update action from Felix Fietkau and Gabor Juhos, respectively. There are a handful of updates to other drivers here and there as well. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/nfs_fs_i.h')
0 files changed, 0 insertions, 0 deletions