Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 23:08:11 +0000 (15:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 23:08:11 +0000 (15:08 -0800)
commit12402b5b7a2aa7ebed246db4570a5eb905fe79ea
tree1751dcf3e63841d8cce4ddb575e3d25a0b6a825b
parent7b5e56f9d635643ad54f2f42e69ad16b80a2cff1
parentc4e061ace75513aee227090486cc46dec7810c00
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6