diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /.gitignore | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index de6344e15706..efab0ebec859 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -36,6 +36,7 @@ modules.builtin | |||
| 36 | # | 36 | # |
| 37 | tags | 37 | tags |
| 38 | TAGS | 38 | TAGS |
| 39 | linux | ||
| 39 | vmlinux | 40 | vmlinux |
| 40 | vmlinuz | 41 | vmlinuz |
| 41 | System.map | 42 | System.map |