Merge branch 'master' into next
authorIvan Pang <i-pang@ti.com>
Fri, 10 Aug 2012 22:44:17 +0000 (18:44 -0400)
committerIvan Pang <i-pang@ti.com>
Fri, 10 Aug 2012 22:44:17 +0000 (18:44 -0400)

Trivial merge