Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 1 Oct 2007 20:11:48 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 1 Oct 2007 20:11:48 +0000 (13:11 -0700)
* 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
  [PATCH] libertas: build problems when partially modular


Trivial merge