summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-05-07 16:01:49 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-05-07 16:01:49 +0100
commitfdfb396d58953597b2fd3e733072fe7bd62d90e5 (patch)
tree3de58eda6ee9f34b14964e35fae3c4883e082c3e /drivers
parenta23e67da55b2e478530f17a031dfa74dc49c006f (diff)
parentb506a1a45947e590217a52b7908c1b66336018fa (diff)
parent21dbe15f7dd0f0511bc0178d142213c3fadfcb99 (diff)
Merge branches 'ep93xx' and 'w90x900' into devel