Merge branch 'master' into next
authorSajesh Kumar Saran <sajesh@ti.com>
Mon, 19 Dec 2011 21:13:32 +0000 (16:13 -0500)
committerSajesh Kumar Saran <sajesh@ti.com>
Mon, 19 Dec 2011 21:13:32 +0000 (16:13 -0500)

Trivial merge