From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 13 Jun 2005 21:47:47 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.12~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=386bfcf5e8a3c34d92156c945c8db58a1e2f7c69;p=linux-2.6

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

386bfcf5e8a3c34d92156c945c8db58a1e2f7c69