summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/include/mach/timex.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-05-28 15:45:14 -0700
committerTony Lindgren <tony@atomide.com>2009-05-28 15:45:14 -0700
commitcd07ecc828486e5887113c7dc4d9f9022145811b (patch)
treef3950d6077a794d4500244b2f372c6912af15eec /arch/arm/mach-imx/include/mach/timex.h
parent4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff)
parentb04e8975e70d9b2bc27c017f92b356b312692544 (diff)
downloadtalos-obmc-linux-cd07ecc828486e5887113c7dc4d9f9022145811b.tar.gz
talos-obmc-linux-cd07ecc828486e5887113c7dc4d9f9022145811b.zip
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/mach-imx/include/mach/timex.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud