From: Paul Mackerras <paulus@samba.org>
Date: Mon, 9 Jun 2008 02:19:41 +0000 (+1000)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.27-rc1~1058^2~174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a3e1c670e503ddd6f6c373b307f38b783ee3a50;p=pandora-kernel.git

Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c
---

8a3e1c670e503ddd6f6c373b307f38b783ee3a50
Reading git-diff-tree failed