diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 11:08:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 11:08:33 +0100 |
| commit | e910b63d009701ad4ebbeb089aba35707fa5d68e (patch) | |
| tree | f7fdd3c2b1d9165d69a778c434e664f8789f4401 /arch/arm/mach-u300/include/mach | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe (diff) | |
| parent | c9c6fe5033191d82e1d819105485c795062107fd (diff) | |
| download | talos-obmc-linux-e910b63d009701ad4ebbeb089aba35707fa5d68e.tar.gz talos-obmc-linux-e910b63d009701ad4ebbeb089aba35707fa5d68e.zip | |
Merge branch 'l7200' into devel
Conflicts:
arch/arm/configs/lusl7200_defconfig
Diffstat (limited to 'arch/arm/mach-u300/include/mach')
0 files changed, 0 insertions, 0 deletions
