From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Feb 2006 17:58:27 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f564c5fe29d3fa9adc6d839714521b0554c62598;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
---

f564c5fe29d3fa9adc6d839714521b0554c62598