projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de8856d 643c61e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlegacy/4965-mac.c patch | diff1 | diff2 | blob | history
include/net/cfg80211.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc include/net/cfg80211.h
Simple merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)