]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:03:38 +0000 (00:03 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:03:38 +0000 (00:03 -0400)
commitff6ed98705d62f6395d2d9802091e8111e9d645c
tree7da638f9bb53b1812b71e40ad6deca91d59ad301
parent50fd230a4bc87ddf3957dc0dc894a11a2d79509c
parentaa919ffef1f03c1ca3ee03011ed2352206e79674
Merge branch 'master' into upstream
MAINTAINERS
drivers/net/au1000_eth.c
drivers/net/sis900.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
include/net/ieee80211.h
net/ieee80211/softmac/ieee80211softmac_assoc.c