Merge tag '3.31.00.02' into fc-next 3.40.00.01_eng 3.40.00.02
authorChris Ring <cring@ti.com>
Tue, 28 Oct 2014 18:16:00 +0000 (11:16 -0700)
committerChris Ring <cring@ti.com>
Tue, 28 Oct 2014 18:16:00 +0000 (11:16 -0700)
3.31.00.02


Trivial merge