From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Dec 2005 00:43:13 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.15-rc7~16^2~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d898d485e721db45be555c27df5de03281f2fd05;p=linux-2.6

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

d898d485e721db45be555c27df5de03281f2fd05