| commit | 8732baafc3f19e69df683c3f0f36c13cec746fb9 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jun 29 12:42:14 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 29 12:42:14 2012 -0400 |
| tree | 9059d0fe8f2a49425edab88ea8e7d5337e13e66c | |
| parent | 7a9bc9b81a5bc6e44ebc80ef781332e4385083f2 [diff] | |
| parent | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b [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/dhd_sdio.c