summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 00:52:14 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 00:52:14 +0100
commit65af7c4608f7b7019e2faa220fb9624988965873 (patch)
tree42be40284249ba4c2584023e94cd12c4df4cffdd /arch/arm/plat-nomadik
parentb1e3be0647fec81887e55edbda0c56c0445f7b53 (diff)
parent4c23c8da96de1af7ed88ee5258af613e8c03c3ad (diff)
downloadop-kernel-dev-65af7c4608f7b7019e2faa220fb9624988965873.zip
op-kernel-dev-65af7c4608f7b7019e2faa220fb9624988965873.tar.gz
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
Diffstat (limited to 'arch/arm/plat-nomadik')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud