Merge branches 'sg_aess_reset_devel_3.9' and 'omap4_pm_fixes_a_3.9' into omap4_prcm_devel_a_3.9

Browse source

...

This commit is contained in:

Paul Walmsley 2013-02-10 11:27:02 -07:00

parent 5cebb23c6c cd19010c03

commit a5a8c31d9f

2 changed files with 29 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

arch/arm/mach-omap2/pm.c

View file

21

arch/arm/mach-omap2/pm44xx.c

View file