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

Merge remote-tracking branch 'xtensa/master'

Conflicts:
	arch/xtensa/configs/iss_defconfig
---

5ca7d7646d5ec2735676e9c7e7a512fe874f5142
Reading git-diff-tree failed