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)
commit200b0182f95a1f97c9fefee88707fb15ce87c22d
treea4ad1cacfeb07258aeb862c6505cd93560d7adb6
parentce7e9065958191e6b7ca49d7ed0e1099c486d198
parent6193d6997c90535af8f8491fc0019f785a3322b0
Merge branch 'fixes' into for-greg