diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:00:29 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:00:29 -0500 |
| commit | 95f84f2959482ee25b5cfe28a048a331ded8667c (patch) | |
| tree | ee15748fa93710bdd81898e9b69acfb73aee8cfd /include | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 (diff) | |
| parent | wl12xx: Correctly set up protection if non-GF STAs are present (diff) | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions