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


Trivial merge