summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa3xx.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-14 12:12:42 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-14 12:12:42 +0000
commit0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 (patch)
treec2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7 /arch/arm/mach-pxa/colibri-pxa3xx.c
parent5b88128fd70dcf0d5d7c0ae7d7849777ff925bde (diff)
parentb9214b9780d6897a6892e7c8cc903168d6fef097 (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa3xx.c')
0 files changed, 0 insertions, 0 deletions