Merge branch 'master' into next
authorIvan Pang <i-pang@ti.com>
Mon, 20 Aug 2012 07:36:46 +0000 (03:36 -0400)
committerIvan Pang <i-pang@ti.com>
Mon, 20 Aug 2012 07:36:46 +0000 (03:36 -0400)

Trivial merge