From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 3 Aug 2009 16:58:02 +0000 (+0100)
Subject: Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.31-rc6~40^2~3
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;ds=sidebyside;h=38a6fe8c013e72c402b37a7ea400387120f460d8;p=safe%2Fjmp%2Flinux-2.6

Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux
---

38a6fe8c013e72c402b37a7ea400387120f460d8