]> err.no Git - linux-2.6/commit
Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:27 +0000 (21:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:27 +0000 (21:16 -0500)
commit7b0386921db20add25afd8678ed34a9253e512fc
tree8c6b888b76211e38e6c1c3006553dc4b2b24c75e
parentc5580a7ecb859c6821dd761c95fa150ec7695ae1
parent22fe472cb430ce45c4fb9b6d13060dd724d6dbc8
Merge branch 'upstream-fixes'
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2200.c