am a61de09c: Merge "Move videodev2.h to include/linux."
authorChristopher Ferris <cferris@google.com>
Mon, 16 Dec 2013 07:56:14 +0000 (23:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Dec 2013 07:56:14 +0000 (23:56 -0800)
* commit 'a61de09c54ec0e38863639d216392acc6fcc311c':
  Move videodev2.h to include/linux.


Trivial merge