Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux...
authorTony Lindgren <tony@atomide.com>
Thu, 17 May 2012 23:44:43 +0000 (16:44 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 17 May 2012 23:44:43 +0000 (16:44 -0700)

Trivial merge