Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Sep 2009 23:23:46 +0000 (16:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Sep 2009 23:23:46 +0000 (16:23 -0700)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-rx.c


Trivial merge