diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-19 23:20:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-19 23:20:22 +0200 |
| commit | 9abf29edbb14a34f86c9e09970adada9f10ccbcf (patch) | |
| tree | e69553e240c2ee2875df5dc9ba2baa45802f6175 /arch/s390/kernel/compat_wrapper.S | |
| parent | 3c89963defdb9ecea862d9a10153d723289e91fc (diff) | |
| parent | 45c7a01f070146e08f5c838315ffca5ade6e3844 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into late/board
From "Rafael J. Wysocki" <rjw@sisk.pl>:
updates for Renesas ARM-based boards for v3.6. Included are:
* Regulator support changes for multiple boards from Guennadi Liakhovetski.
* armadillo800eva and kzm9g support updates from Kuninori Morimoto
and Tetsuyuki Kobayashi.
* GPIO support update for multiple boards from Kuninori Morimoto.
* defconfig updates from Magnus Damm and Simon Horman.
This is based on the 'soc' branch I've just sent a pull request for and on
the following topic branch from the Mark Brown's regulator tree:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tags/topic/fixed
which is requisite for the merge.
* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (35 commits)
ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER
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: kzm9d: Add defconfig
ARM: mach-shmobile: select the fixed regulator driver on several boards
ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g
ARM: mach-shmobile: add fixed voltage regulators to marzen
ARM: mach-shmobile: add fixed voltage regulators to kzm9g
ARM: mach-shmobile: add fixed voltage regulators to kzm9d
ARM: mach-shmobile: add fixed voltage regulators to kota2
ARM: mach-shmobile: add fixed voltage regulators to g4evm
ARM: mach-shmobile: add fixed voltage regulators to bonito
ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
ARM: mach-shmobile: add fixed voltage regulators to ap4evb
ARM: mach-shmobile: add fixed voltage regulators to ag5evm
ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel
ARM: shmobile: use common extra gpio functions on g4evm
ARM: shmobile: use common extra gpio functions on ap4evb
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
0 files changed, 0 insertions, 0 deletions