]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 16:01:37 +0000 (11:01 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 16:01:37 +0000 (11:01 -0500)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge