aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-12-11 00:20:18 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-12-11 00:20:18 +0000
commit0b99cb73105f0527c1c4096960796b8772343a39 (patch)
treefc506dd9b07cf576694aa3190bf4ce5eaa85bd54 /arch/arm/include
parentb8db6b886a1fecd6a5b1d13b190f3149247305ef (diff)
parent810883f05982e7c27ea20f9ec31c6ee926d00ea1 (diff)
parent95e629b761ce36996d1befe2824d5346b5a220b9 (diff)
parentb10bca0bc699af201770989a88fa293155e9d8de (diff)
parent4b85da08c4d19f5de48d904d4f879dcfa04ec14c (diff)
parent946c59a08a2497303750c0fee4367ca32009155c (diff)
parent60d6dd530a6a31c85af9e37eadcb0f90acc76209 (diff)
Merge branches 'cache-l2x0', 'fixes', 'hdrs', 'misc', 'mmci', 'vic' and 'warnings' into for-next