Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2010 09:27:05 +0000 (01:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2010 09:27:05 +0000 (01:27 -0800)
commit675c60706cd197219c6e3e6e3f195475d842344e
tree8af8d2457e6674f01c6f3c3e144b8a391801a1eb
parent662a96bd6f020782dfbdc0d0bd177c7dbb556687
parenta120e912eb51e347f36c71b60a1d13af74d30e83
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/iwlwifi/iwl-core.h