| commit | 87bc0728d462ae37841a550542829aa65a97e7c2 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Nov 04 14:51:28 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Nov 04 14:51:28 2013 -0500 |
| tree | 266afb90f501b814c0a79f10a7afd86a6a33d631 | |
| parent | f421436a591d34fa5279b54a96ac07d70250cc8d [diff] | |
| parent | 01925efdf7e03b4b803b5c9f985163d687f7f017 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h