summaryrefslogtreecommitdiff
path: root/arch/arm/mach-versatile/include/mach/timex.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 22:27:40 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 22:27:40 +0400
commitec19628d72cff8f80220b7cedba089074ac6a599 (patch)
treec3ec69d6648fdfd3e19563fa341d6585a3d77567 /arch/arm/mach-versatile/include/mach/timex.h
parent4b60e5f90dec4ae251386f20464336369e962e9c (diff)
parentb0ec5cf191eeca7fd885ef2860e9a586d29bff00 (diff)
parent603605abae9ee731bdafb2af83a487d98a568815 (diff)
parent8373dc38ca8d4918210710807256a313cd111f0b (diff)
parent399bc4863e2a3b4b255ca22189820c81ca34f4e0 (diff)
parent16dc062b42459e6ddd244c2bc8255cac45db47e4 (diff)
parentf1f6ac111d6b1c55a604afbbff966e284b392050 (diff)
downloadlinux-ec19628d72cff8f80220b7cedba089074ac6a599.tar.xz
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus