From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 17 Feb 2006 21:27:40 +0000 (-0800)
Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=00ab2f3df33dd3e649904765767dd87ffbcb3acf;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6
---

00ab2f3df33dd3e649904765767dd87ffbcb3acf