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

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

1ff9ba7af6033475998be61c7d1dc0e0c8c11181