| commit | a59f975a78f0606a3a364939dfa9b949d5f87521 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jun 12 14:09:59 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jun 12 14:11:13 2012 -0400 |
| tree | 42ef7708cdec5263026a5e1e84d960d6ba20844f | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec [diff] | |
| parent | 6aee4ca3d2217d3f76469e5ed576d62695f0912a [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c