Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 21:32:33 +0000 (14:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 21:32:33 +0000 (14:32 -0700)
commit56e9c0a6eb4918ae010aa4689e4481ab67986a0c
treeae92769a6f62c01be0e5d0d73a5aa6ddd81dde76
parent6c00055a819ce8a6e2c3af2f65d4ea1a8559c491
parent9aab3e3ee6f256a1eaabc275e0748132966f963d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6