summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 11:29:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 11:29:31 +0100
commit4ba21e868f4b6e2ce5432055e206edadc6319533 (patch)
tree0d06d66d00c091ebd2abc88cfcf9332b6bc08f18 /drivers/clocksource
parent3e175ca4cab37b1eb99f7cf032142a1e5cdb3d97 (diff)
parent60db4fcf14c6b562399579473a67e51eed694ff4 (diff)
parentfada8dcf2d085f4e2eb1ba760c8d37111977dbec (diff)
Merge branches 'l2', 'pgt2' and 'misc' into for-linus