Merge branch 'v3.3/features' of git://gitorious.org/linux-davinci/linux-davinci into...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:07:10 +0000 (21:07 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:07:10 +0000 (21:07 -0800)

Trivial merge