From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 23:09:30 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc1~660
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3995f4c5327595b51482bdac8c189736262eb6e0;p=linux-2.6

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

3995f4c5327595b51482bdac8c189736262eb6e0