Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
commit8085106a58366fb2c6c14d89e3d4395d2702d4a1
authorJeff Garzik <jeff@garzik.org>
Mon, 17 Dec 2007 23:05:43 +0000 (17 18:05 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 17 Dec 2007 23:05:43 +0000 (17 18:05 -0500)
tree9c349f8ad0d6536cfd16f046776d9c8a71c81c21
parent961994a0c2a24d9622eea7144b30ac773169659f
parent53e490936a91940a153e231c3b8288e3ecfcc5aa
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes