| commit | b3c911eeb47d08aada986f769b6a060794dfe9d0 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jun 19 14:41:22 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jun 19 14:41:22 2012 -0400 |
| tree | 212209c15a26006a62da9252efe18f27f16a0a4a | |
| parent | 43b03f1f6d6832d744918947d185a7aee89d1e0f [diff] | |
| parent | daf67ce8cffd148308ae15c25fb06c1fc20c88f1 [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/dvm/testmode.c drivers/net/wireless/iwlwifi/pcie/trans.c