Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 7 Oct 2010 18:40:26 +0000 (14:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 7 Oct 2010 18:40:26 +0000 (14:40 -0400)
commitedbe4073a84713c1c01a3f37fb880f151d0a5b68
tree84b910c5af793c80c6671f414b30c122fa269732
parent7573eac762af253e0b61b60cce34ab80f2dd45c7
parentcf9768d6a3f901b00fc9d8ecdf8e506d7cbcae99
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
drivers/net/wireless/iwlwifi/iwl-core.c