diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:55:32 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:55:32 +0900 |
| commit | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch) | |
| tree | a7f2cdb121fc44cfd7c382207104f867f93736c9 /Makefile | |
| parent | fac3d3555568de1755025a9609daf492dd548a59 (diff) | |
| parent | eff4c74da7944ba30feb47b51d1e9e940e6682ff (diff) | |
| download | talos-op-linux-ea5a4e209ddca984bbb5803b30d5e013e631f9ac.tar.gz talos-op-linux-ea5a4e209ddca984bbb5803b30d5e013e631f9ac.zip | |
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1
Conflicts:
arch/arm/mach-s5pv210/include/mach/map.h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
