From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 5 May 2005 02:52:45 +0000 (-0700)
Subject: Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=897f5ab2cd733a77a2279268262919caa8154b9d;p=openwrt%2Fstaging%2Fblogic.git

Merge ... /linux/kernel/git/aegl/linux-2.6.git
---

897f5ab2cd733a77a2279268262919caa8154b9d