summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-07-04 10:41:18 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-07-04 10:41:18 +0900
commitadf34e00e297fe0ce09424d975235fb4367b2b4b (patch)
treebff08d1f3a171aa4df932650599fffda3375a363 /arch/arm/mach-shmobile
parentc7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff)
parentb9b7b24dff8af848a726a16d011bbe6a5a6ba0db (diff)
parentd4759ded3bdf3eb004d583011707fdc21aeda94e (diff)
Merge branch 'soc', tag 'renesas-sh-sci-for-v3.11' into dt-lager