diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 23:35:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 23:35:59 +0200 |
| commit | af496a67c101b2161a12c1bc70626f6a479501bb (patch) | |
| tree | 54ae84787e455a5e22094e2db3423dc7b4d10f81 /arch/arm/mach-s3c24a0/include/mach/regs-clock.h | |
| parent | 382bc10fbe827191218d4eecfaca0995b085dbfd (diff) | |
| parent | fdb3b4c31541c8516d4ec593a74e1f3081028061 (diff) | |
Merge branch 'depends/omap_dss2' into for-next
Conflicts:
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Diffstat (limited to 'arch/arm/mach-s3c24a0/include/mach/regs-clock.h')
0 files changed, 0 insertions, 0 deletions