diff options
| author | John W. Linville | 2011-02-18 23:03:41 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-02-18 23:03:41 +0100 |
| commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
| tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /MAINTAINERS | |
| parent | mac80211: Clear PS related flag on disabling power save. (diff) | |
| parent | ath5k: Correct channel setting for AR2317 chip (diff) | |
| download | kernel-qcow2-linux-b67afe7f43afd2f5cd98798993561920c1684c12.tar.gz kernel-qcow2-linux-b67afe7f43afd2f5cd98798993561920c1684c12.tar.xz kernel-qcow2-linux-b67afe7f43afd2f5cd98798993561920c1684c12.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions