Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 Dec 2009 22:19:31 +0000 (14:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Dec 2009 22:19:31 +0000 (14:19 -0800)
commitba2dca91f000e4796c23d14834680dd90528842f
treefd27c7383f779c1276bed7a1ddaea81efc4395a2
parentc557c15d83ea16e6c1a043c8eccb0f60bb19cb96
parent65182b9fb004220f250d4269c864cf0f1f372e85
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6