diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 22:22:33 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 22:22:33 +0200 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /Documentation/DocBook/v4l/.gitignore | |
| parent | Merge branch 'master' into for-linus (diff) | |
| parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-baea7b946f00a291b166ccae7fcfed6c01530cc6.tar.xz linux-baea7b946f00a291b166ccae7fcfed6c01530cc6.zip | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'Documentation/DocBook/v4l/.gitignore')
| -rw-r--r-- | Documentation/DocBook/v4l/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/v4l/.gitignore b/Documentation/DocBook/v4l/.gitignore new file mode 100644 index 000000000000..d7ec32eafac9 --- /dev/null +++ b/Documentation/DocBook/v4l/.gitignore @@ -0,0 +1 @@ +!*.xml |