]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 716b433 a5fe736)
Merge upstream net/ieee80211.h changes into 'ieee80211' branch.
authorJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:49:47 +0000 (22:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:49:47 +0000 (22:49 -0400)
1  2 
include/net/ieee80211.h patch | diff1 | diff2 | blob | history

diff --cc include/net/ieee80211.h
Simple merge
Linux 2.6 source tree