Merge branch 'upstream-fixes'
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Mar 2006 22:02:08 +0000 (17:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Mar 2006 22:02:08 +0000 (17:02 -0500)
commitdd288e7d75b9041f79fecae77d61cfa345da7266
tree85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd
parent30dcbf29cc6d92d70fa262e79e84011fe6913bed
parent72df16f109b73be37977a26d342e9103e8851cb6
Merge branch 'upstream-fixes'
drivers/net/tg3.c
net/ieee80211/ieee80211_crypt_ccmp.c
net/ieee80211/ieee80211_rx.c