aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-12-21 17:33:21 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-12-21 17:35:17 +0100
commit61a317f3045240ea577a137c480c9d1fe76ad43a (patch)
tree0f4125d0a0843bf9132d873f44ed903872d0a2d5 /samples
parentdcdd2418c7d94123f3f687ef7befaf8319d72f9a (diff)
parentb9943538bfbb6f99bfc08e744896d7593318b07b (diff)
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
Conflicts: arch/arm/mach-s3c2442/Kconfig arch/arm/mach-s3c2442/Makefile arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions