Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers

Browse source

Again, resolve conflicts identical to how Tony did.

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

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2012-11-05 10:28:21 -08:00

parent 365480d67b 7bd3b61853

commit 6c97a18959

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