git.stricted.de - GitHub/mt8127/android_kernel_alcatel

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

author	Rafael J. Wysocki <rjw@sisk.pl>
	Wed, 11 Jul 2012 21:06:35 +0000 (23:06 +0200)
committer	Rafael J. Wysocki <rjw@sisk.pl>
	Wed, 11 Jul 2012 21:06:35 +0000 (23:06 +0200)
commit	8600fb68cfa8f89e23cf872efb87fec641cc747d
tree	60ec7cbf9f2f09fd97f1895cc4b3854414fe1db9	tree \| snapshot (tar.gz zip)
parent	8533bae35becc0b18dc5a6c59ead36dee57cfb47	commit \| diff
parent	70523b4e57cb6eeb1da7c8ebf19df855221825ad	commit \| diff

arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history