From: Tony Lindgren <tony@atomide.com>
Date: Thu, 17 May 2012 23:44:43 +0000 (-0700)
Subject: Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux... 
X-Git-Tag: v3.6-rc1~148^2~4^2~9^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=222e5cec47a54ff3dde72e7dfba10c67da3adca0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux into fixes-omap4-dsp
---

222e5cec47a54ff3dde72e7dfba10c67da3adca0