Merge branch 'linux-c6x-2.0.x' into next
authorSajesh Kumar Saran <sajesh@ti.com>
Sun, 4 Dec 2011 23:13:21 +0000 (18:13 -0500)
committerSajesh Kumar Saran <sajesh@ti.com>
Sun, 4 Dec 2011 23:13:21 +0000 (18:13 -0500)

Trivial merge