| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Aug 28 10:36:09 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Aug 28 10:36:09 2013 -0400 |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 | |
| parent | 6e956da2027c767859128b9bfef085cf2a8e233b [diff] | |
| parent | 19c361608ce3e73f352e323262f7e0a8264be3af [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c net/mac80211/ibss.c