Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Jan 2011 02:52:31 +0000 (18:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Jan 2011 02:52:31 +0000 (18:52 -0800)
commitbb1231052e265e960d902ab32e67c5ccdabc9434
tree3dd999a598355ff0d82f56eea1ffa49a81c8a42c
parent72b43d0898e97f588293b4a24b33c58c46633d81
parent4e5518ca53be29c1ec3c00089c97bef36bfed515
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6