Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Aug 2008 21:02:13 +0000 (14:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Aug 2008 21:02:13 +0000 (14:02 -0700)
commit143b11c03cd42f2284efe5128afc057d8fc86c78
tree8186830c461b7933c26cdd00b69e4c737c5c88e7
parentaf01d537463714e36e2c96d2da35902b76cd6827
parent18c8adeb0244f823ba78a51e23f813fe68bc3c54
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6