From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 22 Jun 2005 21:51:06 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.13-rc1~68^2~536
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4936044001694f033fe4ea94d6034d51a6b465c;p=linux-2.6

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

a4936044001694f033fe4ea94d6034d51a6b465c