Merge remote-tracking branch 'origin/3.00' into ipc-3.10-next ipc-3.10-next
authorChris Ring <cring@ti.com>
Mon, 9 Dec 2013 20:46:10 +0000 (12:46 -0800)
committerChris Ring <cring@ti.com>
Mon, 9 Dec 2013 20:46:10 +0000 (12:46 -0800)
Conflicts:
linux/src/tests/Makefile.am
linux/src/tests/Makefile.in

1  2 
configure

diff --cc configure
Simple merge