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

This commit is contained in:
Tony Lindgren 2012-05-17 16:44:43 -07:00
commit 222e5cec47
4 changed files with 12 additions and 11 deletions