From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 1 Dec 2005 23:53:33 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.15-rc5~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca98f825ea05edb41346f12408caa30be8a287c6;p=linux-2.6

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

ca98f825ea05edb41346f12408caa30be8a287c6