summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-osiris.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-01 14:07:32 -0700
committerOlof Johansson <olof@lixom.net>2012-10-01 14:07:32 -0700
commit17a505edb09495510ac8998450980472c412455b (patch)
tree07f3a9e512f67cffae1dde071c8247821dd17e60 /arch/arm/mach-s3c24xx/mach-osiris.c
parentd9a807461fc8cc0d6ba589ea0730d139122af012 (diff)
parentb10dcdcac43b2b5adf800a19f782fef38ada75a1 (diff)
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-osiris.c')
0 files changed, 0 insertions, 0 deletions