Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 13:42:33 +0000 (05:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 13:42:33 +0000 (05:42 -0800)
commit744595c847cefd6ac0eec8f66e9fba95687c3f4f
tree3d4b4e5213b584567d87f705f369808d7cfe8dbd
parentc928febf4bc703ea542340e5a208e0445d998839
parent3092ad054406f069991ca561adc74f2d9fbb6867
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6