| commit | 8e00f5fbb4ecbc3431fa686cba60cd76a62604af | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Sep 30 14:52:16 2011 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Sep 30 14:52:29 2011 -0400 |
| tree | 78aa3bdef892dbd1afc8969fc528e529cfc266f7 | |
| parent | 56fd49e399ce1d82200fad5b8924d4e35a587809 [diff] | |
| parent | 0874073570d9184a169a4ae2abbe8dbcb71878e9 [diff] |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/wl12xx/main.c