am b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."
authorChristopher Ferris <cferris@google.com>
Mon, 16 Dec 2013 08:00:34 +0000 (08:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Dec 2013 08:00:34 +0000 (08:00 +0000)
* commit 'b39943bf1902f5ff6967f55721066f787465f035':
  Move videodev2.h to include/linux.


Trivial merge