Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers

Browse source

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n8x0.c

...

This commit is contained in:

Tony Lindgren 2012-10-25 12:21:48 -07:00

parent 6d02643d64 7bd3b61853

commit 2da8a79f7d

5 changed files with 50 additions and 52 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

2

arch/arm/mach-omap2/board-h4.c

View file

2

arch/arm/mach-omap2/board-n8x0.c

View file

2

drivers/mfd/menelaus.c

View file

2

arch/arm/plat-omap/include/plat/menelaus.h → include/linux/mfd/menelaus.h

View file