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)
commit75e7766680b4b196073bdc941b8a6570b9f777af
tree71ce4e83878a3dd9a83559c7d51ec549668cef3a
parentb7e0fe9f81e19c4f2a1369b324c3c062c1738be4
parent53cb4791c156908ae634de31949f7f25f8de002b
Merge branch 'fixes-davem' of git://git./linux/kernel/git/linville/wireless-2.6
net/mac80211/ieee80211.c