Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Apr 2010 19:54:15 +0000 (12:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Apr 2010 19:54:15 +0000 (12:54 -0700)
commit6c9ae016a8e2aff931391d3baa9ce6cb0ffa633c
tree38a179b61e66b8b511b2b72da1f4486ee89b9821
parent0c75ba22541ccea88e89782373991109a7ec2a54
parent0250ececdf6813457c98719e2d33b3684881fde0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/p54/p54pci.c