From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 15 Oct 2008 22:16:07 +0000 (+0100)
Subject: Merge branch 'fixes' into for-linus
X-Git-Tag: v2.6.28-rc1~293^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2502991560dc8244dbe10e48473d85722c1e2ec1;p=linux-2.6-omap-h63xx.git

Merge branch 'fixes' into for-linus

Conflicts:

	arch/arm/mach-versatile/core.c
---

2502991560dc8244dbe10e48473d85722c1e2ec1