diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-16 23:00:23 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 23:00:23 +0100 |
| commit | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /arch/arm/mach-omap2/cm2xxx_3xxx.c | |
| parent | ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init (diff) | |
| parent | ARM: OMAP4: PRM: use PRCM interrupt handler (diff) | |
| download | linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.tar.xz linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.zip | |
Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/cm2xxx_3xxx.c')
0 files changed, 0 insertions, 0 deletions