Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2

Browse source

...

This commit is contained in:

Tony Lindgren 2013-02-12 09:01:25 -08:00

parent 58a656b77a 6efc3fe0f4

commit 25e4d0f6df

3 changed files with 3 additions and 4 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

3

arch/arm/mach-omap2/am35xx-emac.c

View file

2

arch/arm/mach-omap2/devices.c

View file

2

arch/arm/mach-omap2/sr_device.c

View file