projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94d57c4 1728943)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
1  2 
drivers/net/wireless/airo.c patch | diff1 | diff2 | blob | history
net/mac80211/main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/airo.c
Simple merge
diff --cc net/mac80211/main.c
Simple merge
Domain: System / Uncategorized;