diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 01:00:09 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 01:00:09 -0400 |
| commit | 5aa8d1a23dfdc1e331c134164009cc929c63447e (patch) | |
| tree | b1153d900248bea0e4c78753370275209af628b9 /arch/arm/mach-omap2/mux34xx.c | |
| parent | 42e9e0e57c6d8228e83ca175e7b789771dedca95 (diff) | |
| parent | 2d73da461e404f647657beb6966023e79bbe146f (diff) | |
Merge remote branch 'catalin/stable-2.6.35'
Conflicts:
arch/arm/kernel/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/mm/mmu.c
Diffstat (limited to 'arch/arm/mach-omap2/mux34xx.c')
0 files changed, 0 insertions, 0 deletions