Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 21:18:09 +0000 (14:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 21:18:09 +0000 (14:18 -0700)
commit3f968de276a8e585deb182d4ba56013a479c80bc
treebff8932bb5e64c22708aad48a6edbef3a707a774
parent5ca1b998d33c39819fca2b675d80c4469e705f2d
parentd0bec34293bb0b8dddc26d25bd46a6631d6b3ec3
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6