Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Nov 2008 22:27:58 +0000 (14:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Nov 2008 22:27:58 +0000 (14:27 -0800)
commitd7713ccc7bec64fbe0e4e39f93b17dfec711db7f
tree586afddc7e21ecaa82fc9af369778e53de93fb4e
parent11c6dd2c723a9ff9bdd4ee11b2798a08abc94e98
parent020cf6ba7a91ccc5db359f91e9abba175fd3a0aa
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6