Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Apr 2010 17:42:26 +0000 (13:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Apr 2010 17:42:26 +0000 (13:42 -0400)
commit1805a34fa33b6284ab8139dd43779b94de58669a
treeeb4c1fb002b5ac26bba7e580c564243535269706
parentace5d5de6bbaff00d3b5dd7ea8f160b570fdb726
parentece6444c2fe80dab679beb5f0d58b091f1933b00
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-4965.c