Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Apr 2011 20:16:51 +0000 (13:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Apr 2011 20:16:51 +0000 (13:16 -0700)
commitdd5030404695d81792a21cba575e02b21a2f275a
tree3444db9d86b9a9c325066fd5fd2bc62397f1a04a
parent38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9
parent332704a51498a7e29aa92c19dc03f11f80b71bfe
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/iwlegacy/iwl-core.c