summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-10-27 21:09:36 +0300
committerJohn W. Linville <linville@tuxdriver.com>2014-10-27 21:09:36 +0300
commit490f0dc4d52a01904cead9dd2fa57956ca737eb7 (patch)
tree1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627 /README
parent61ed53deb1c6a4386d8710dbbfcee8779c381931 (diff)
parent84cbf3a7592879810f80cece6c7f736f099ab163 (diff)
downloadlinux-490f0dc4d52a01904cead9dd2fa57956ca737eb7.tar.xz
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
Conflicts: drivers/net/wireless/ath/wil6210/wil6210.h
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions