From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 19 Nov 2005 23:21:51 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.15-rc2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ac878a71d1900cc2e283819b1daa388961ab6e;p=linux-2.6

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

29ac878a71d1900cc2e283819b1daa388961ab6e