From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 28 Jun 2005 22:00:08 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.13-rc1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e568e62e9d4674d487cdc11f369e49e56ce6703;p=thirdparty%2Fkernel%2Fstable.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm
---

7e568e62e9d4674d487cdc11f369e49e56ce6703