aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 18:05:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 18:05:10 +0100
commit4b60e5f90dec4ae251386f20464336369e962e9c (patch)
tree13ca50e109a23bcc5e1622ca658000cb85668d1e /arch/arm/mach-davinci/include
parente8765afe54b72b85ffe2b60683710ff450a92912 (diff)
parent667f390bee987d45351402e42008c52cdfb77d76 (diff)
parenta35d4e58737116fd4126c240a1faeb735839435e (diff)
parent4d5336d50a7b4992c90729c27dae027a3426c48c (diff)
parent041f10d46f97c87f8ae1cdb4117682214732cc45 (diff)
parentbe20902ba67de70b38c995903321f4152dee57b7 (diff)
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate