summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-12 10:53:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-12 10:53:27 +0100
commit75e657721cdc762032caf9efa843efb59c607e41 (patch)
tree397bb3a733bec57e34dc496a8e7611c4a55cb02a /include
parent18ffd4026555e9e449eb7126e5b93b30da0fc90f (diff)
parentb0ec5cf191eeca7fd885ef2860e9a586d29bff00 (diff)
parenta904f5f9eb7a55baacb2f4c1423cac8a8eb78a3a (diff)
parentc901868d96b241c40321588d696cc30dce118e6f (diff)
parent399bc4863e2a3b4b255ca22189820c81ca34f4e0 (diff)
parent1537e670a726f2f1648aee46ad7df31853bee40a (diff)
parent16dc062b42459e6ddd244c2bc8255cac45db47e4 (diff)
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'pgt' and 'remove' into for-next