Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 23:13:08 +0000 (19:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 23:13:08 +0000 (19:13 -0400)
commit78d41b35a9570b7a9a45686789df5dfaeb2b7f4c
treea28432584132a7c810b6b243795aec43544205ab
parent9bbc052d5e63512b0ce4e201ea97e12fba9fda82
parent2ae1b8b35faba31a59b153cbad07f9c15de99740
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/iwlegacy/iwl-core.c