]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Jan 2011 19:49:49 +0000 (11:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jan 2011 19:49:49 +0000 (11:49 -0800)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge