]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
commitd77c8d5daf2bc1ab594ddace4e8b37b11e441762
tree76c42bde578332499d3fb77f5cdd110041476cee
parentd11c84eb78fca96207fc8a796c11af14c0286384
parentd74952d52fb9a2eff386525a5cd5e673673ae2cc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl3945-base.c