]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c3ee9e b955fba)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -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.