diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:52:14 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:52:14 +0100 |
commit | 65af7c4608f7b7019e2faa220fb9624988965873 (patch) | |
tree | 42be40284249ba4c2584023e94cd12c4df4cffdd /arch/arm/mach-ux500/Makefile | |
parent | clocksource: fixup ux500 build problems (diff) | |
parent | ARM: omap: use __devexit_p in dmtimer driver (diff) | |
download | linux-65af7c4608f7b7019e2faa220fb9624988965873.tar.xz linux-65af7c4608f7b7019e2faa220fb9624988965873.zip |
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
Diffstat (limited to 'arch/arm/mach-ux500/Makefile')
0 files changed, 0 insertions, 0 deletions