]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
projects / thirdparty / kernel / stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d6a5e9 808ff69)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Mar 2009 22:04:31 +0000 (15:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Mar 2009 22:04:31 +0000 (15:04 -0700)
1  2 
drivers/net/wireless/ath9k/hw.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath9k/main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath9k/hw.c
Simple merge
diff --cc drivers/net/wireless/ath9k/main.c
Simple merge
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git