From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 15 Jan 2006 21:33:09 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc1~98
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0238cb4e7583c521bb3538060f98a73e65f61324;p=linux-2.6

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

0238cb4e7583c521bb3538060f98a73e65f61324