From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 18 Jun 2005 23:06:50 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.14-rc2~49^2~36^2~46
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3aa3dfb372576f30835a94409556e3c8681b5756;p=users%2Fhch%2Fmisc.git

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

3aa3dfb372576f30835a94409556e3c8681b5756