diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-12 21:57:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-12 21:57:52 +0100 |
| commit | fd2e1dd7bb2e4f19e063aff9194b795be8510464 (patch) | |
| tree | f3f94c341531014a3e2cd175984c553671458ea1 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | Linux 3.7-rc5 (diff) | |
| parent | ASoC: fsi: add master clock control functions (diff) | |
| parent | ARM: shmobile: Remove G4EVM machine support (diff) | |
| parent | ARM: shmobile: r8a7740: Enable PMU (diff) | |
| download | linux-fd2e1dd7bb2e4f19e063aff9194b795be8510464.tar.xz linux-fd2e1dd7bb2e4f19e063aff9194b795be8510464.zip | |
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
These are all dependencies for the renesas/boards2 branch.
Conflicts:
arch/arm/configs/marzen_defconfig