Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 1 Apr 2010 02:32:50 +0000 (19:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Apr 2010 02:32:50 +0000 (19:32 -0700)
commitd5dc056cce9e60528d5eac64efed623d26ffe46f
treeb5124013d0935be211fd1df702db2f69c581c5ab
parent00ae702847df5566ce9182e9c895185e2ad1c181
parent7371400431389e1df6a2a05ab9882055b8a6ff2c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/rt2x00/rt2500usb.c