From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 14 May 2010 19:09:46 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion... 
X-Git-Tag: v3.12-rc1~10308^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b12f3cbd7a9a869eae1eb108da02526b132ba80b;p=kernel%2Fkernel-generic.git

Merge branch 'master' of git://git./linux/kernel/git/nico/orion into devel-stable
---

b12f3cbd7a9a869eae1eb108da02526b132ba80b