diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
commit | 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5 (patch) | |
tree | adf37371beb73adbb0d2414a52d86580dd37d2e0 /drivers/media/dvb/dvb-core/dvbdev.c | |
parent | Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer (diff) | |
parent | clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer (diff) | |
download | linux-dev-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.tar.xz linux-dev-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.zip |
Merge branch 'picoxcell/timer' into next/timer
Imported from mailing list
* picoxcell/timer:
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvbdev.c')
0 files changed, 0 insertions, 0 deletions