Merge branch 'master' into for-linus
[safe/jmp/linux-2.6] / include / media / soc_mediabus.h
2009-12-16 Guennadi LiakhovetskiV4L/DVB (13658): v4l: add a media-bus API for configuri...