diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 18:08:56 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 18:08:56 (GMT) |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /kernel/.gitignore | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
| download | linux-fsl-qoriq-5a89770daad83df74d77a8d34a1ffaedae565ce9.tar.xz | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'kernel/.gitignore')
0 files changed, 0 insertions, 0 deletions