From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 29 Nov 2005 08:57:04 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~7
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4fe1eaf6f39ed3270aff6068d84a2e6a452da734;p=net-next-2.6.git

Merge branch 'master'
---

4fe1eaf6f39ed3270aff6068d84a2e6a452da734