Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 25 Sep 2008 20:16:16 +0000 (13:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Sep 2008 20:16:16 +0000 (13:16 -0700)
commitdb4148da2cc84c31419b5e3ae3115ac6e11817a1
tree72d7d99cd7a4903e017169e0ae8e2b37027129c6
parentef40a685311bef053dedd833a72dffaf25669dda
parent8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6