Merge remote-tracking branch 'github/pia335x-mmi-dev' into pia335-mmi-ml

Conflicts:
	arch/arm/mach-omap2/board-am335xpia.c
Merge remote-tracking branch 'github/pia335-mmi-ml' into pia335-mmi-ml

Conflicts:
	arch/arm/mach-omap2/board-am335xpia.c

Signed-off-by: Marian Lüder <m.lueder@pironex.de>
ARM: pia335x: audio: fixed pinmux issue

Signed-off-by: Marian Lüder <m.lueder@pironex.de>
ARM: pia335x: Audio: added missing clock signal

Signed-off-by: Marian Lüder <m.lueder@pironex.de>
Merge remote-tracking branch 'github/pia335-mmi-ml' into pia335x-mmi-dev

* github/pia335-mmi-ml:
  ARM: pia335x: Audio: added missing clock signal
  ARM: pia335x: audio: fixed pinmux issue

Conflicts:
	arch/arm/mach-omap2/board-am335xpia.c

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>