From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 18 Dec 2008 22:15:30 +0000 (+0000)
Subject: Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
X-Git-Tag: v2.6.29-rc1~559^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fdb0a1a67e131f07a308730c80d07e330211d2e0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
---

fdb0a1a67e131f07a308730c80d07e330211d2e0