Merge branch 'fixes' into for-greg
authorFelipe Balbi <balbi@ti.com>
Mon, 15 Aug 2011 16:02:25 +0000 (19:02 +0300)
committerFelipe Balbi <balbi@ti.com>
Mon, 15 Aug 2011 16:02:25 +0000 (19:02 +0300)

Trivial merge