From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 25 Oct 2010 08:41:30 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: next-20110726~34^2~406
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4993808134da376e2040a40a985e07ca4dd996ae;p=karo-tx-linux.git

Merge branch 'for-linus' into for-next

Conflicts:
	arch/powerpc/platforms/85xx/p1022_ds.c
---

4993808134da376e2040a40a985e07ca4dd996ae