From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 14 Dec 2005 23:48:06 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.12-rc1~39001^2~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7868048a7314bb4a2973097d605f00acd3b70bd;p=kernel%2Fkernel-generic.git

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

c7868048a7314bb4a2973097d605f00acd3b70bd