From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 18 Jan 2006 23:18:53 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.12-rc1~39117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2333f2120759bb2a3edcc0d32b2f310048ee610d;p=kernel%2Fkernel-generic.git

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

2333f2120759bb2a3edcc0d32b2f310048ee610d