| commit | 0d8165e9fca119b804de2cf35674e07c36c9704f | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Aug 29 14:08:24 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Aug 29 14:08:24 2013 -0400 |
| tree | 3d66d027b502b6fdb98666a9121c7f52b48c657d | |
| parent | 4c9d546f6c522f541dfb01e192ab7101eca0053b [diff] | |
| parent | 076f0d20b636ef0e701e21e701c0631b5757b732 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c