]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f3e01f b7753c8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 18:47:07 +0000 (14:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 18:47:07 +0000 (14:47 -0400)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
include/net/mac80211.h patch | diff1 | diff2 | blob | history
net/mac80211/cfg.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc include/net/mac80211.h
Simple merge
diff --cc net/mac80211/cfg.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.