tree 074217d54d57d691fc39717f8ecfb569545ca315
parent f9690f3681c891d37783e1d619fddeb93b68aac4
parent f998351c755a0e87785f2616c4f91f1b3b19b149
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191269508 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191269508 -0700

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

* 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
  [PATCH] libertas: build problems when partially modular