]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
projects / thirdparty / iw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58f018c 46c1ad1)
Merge branch 'mesh-params'
authorJohannes Berg <johannes@sipsolutions.net>
Thu, 23 Oct 2008 07:55:43 +0000 (09:55 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Thu, 23 Oct 2008 07:55:43 +0000 (09:55 +0200)
Conflicts:

nl80211.h

1  2 
nl80211.h patch | diff1 | diff2 | blob | history

diff --cc nl80211.h
Simple merge
Mirror git://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git