diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /Documentation/.gitignore | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'Documentation/.gitignore')
| -rw-r--r-- | Documentation/.gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore new file mode 100644 index 000000000000..bcd907b4141f --- /dev/null +++ b/Documentation/.gitignore | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | filesystems/dnotify_test | ||
| 2 | laptops/dslm | ||
| 3 | timers/hpet_example | ||
| 4 | vm/hugepage-mmap | ||
| 5 | vm/hugepage-shm | ||
| 6 | vm/map_hugetlb | ||
| 7 | |||