summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-03 11:52:02 -0600
committerPaul Walmsley <paul@pwsan.com>2012-09-03 11:52:02 -0600
commit8a94febc21743fe121bdaf1d1470d98b1135acc2 (patch)
treeee8aaf0e2116aa0e01d4cc8260cf9930212a1ef0 /arch/arm
parent577650139062dcc20246da3f61e0bdafc65edf8f (diff)
parentbfb7dd25fcde96d08591258bc7e97500337a57ee (diff)
parentb360124ea008fcccf440840bde2c7f317bc31509 (diff)
Merge branches 'clkdev_fixes_3.6rc', 'clkdm_fixes_3.6rc' and 'hwmod_data_fixes_a_3.6rc' into omap_fixes_a_3.6rc