]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c3ee9e 4796007)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
Conflicts:
drivers/net/wireless/wl12xx/spi.c

1  2 
drivers/net/wireless/ath/ath9k/main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.