From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 11 Jul 2012 21:06:35 +0000 (+0200)
Subject: Merge branch 'renesas-armadillo' into renesas-board
X-Git-Tag: v3.6-rc1~63^2~1^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8600fb68cfa8f89e23cf872efb87fec641cc747d;p=pandora-kernel.git

Merge branch 'renesas-armadillo' into renesas-board

* renesas-armadillo:
  ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace
  ARM: shmobile: armadillo800eva: A3SP domain includes USB
  ARM: shmobile: armadillo800eva: A4LC domain includes LCDC
  ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode
  ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
  ARM: shmobile: use common extra gpio functions on armadillo800eva
  ARM: shmobile: armadillo800eva: enable DMAEngine on USB
  ARM: shmobile: armadillo800eva: enable DMAEngine on SDHI
  ARM: shmobile: armadillo800eva: enable DMAEngine on FSI
  ARM: shmobile: armadillo800eva: enable FSI-HDMI sound
  ARM: shmobile: armadillo800eva: enable FSI-WM8978 sound

Conflicts:
	arch/arm/mach-shmobile/Kconfig
---

8600fb68cfa8f89e23cf872efb87fec641cc747d
Reading git-diff-tree failed