]> err.no Git - linux-2.6/commitdiff
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Nov 2007 12:29:27 +0000 (23:29 +1100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Nov 2007 12:29:27 +0000 (23:29 +1100)
1  2 
net/mac80211/ieee80211.c

Simple merge