From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 01:41:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'galak/next'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565b44c0ad51d7aaad4cefbfc1fa7e4ba9ecf96c;p=pandora-kernel.git

Merge remote-tracking branch 'galak/next'

Conflicts:
	arch/powerpc/boot/dts/p2020ds.dts
	arch/powerpc/boot/dts/p2020rdb.dts
---

565b44c0ad51d7aaad4cefbfc1fa7e4ba9ecf96c
Reading git-diff-tree failed