Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 12 Apr 2010 19:20:53 +0000 (15:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 12 Apr 2010 19:20:53 +0000 (15:20 -0400)
commitb1f90866fb3a329b1c4ebfff93ae9c110943e50a
tree9c765f6d21c8cad4906a2d1eb1b26f4f9842a3d6
parent68dd5b7a45d1935fcd32b786e8d3d3f7bb4bbfe7
parent470058e0ad82fcfaaffd57307d8bf8c094e8e9d7
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
drivers/net/wireless/iwlwifi/iwl-4965.c