diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-22 18:17:18 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-22 18:17:18 +0200 |
| commit | e9a86d96be0dff611156ea89fbb6eb91478bddab (patch) | |
| tree | ad38c21c76e1c275264cb20482a7f2bdd54618ba /kernel/delayacct.c | |
| parent | ARM: exynos_defconfig: Update exynos_defconfig (diff) | |
| parent | ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY (diff) | |
| download | linux-e9a86d96be0dff611156ea89fbb6eb91478bddab.tar.xz linux-e9a86d96be0dff611156ea89fbb6eb91478bddab.zip | |
Merge tag 'sti-defconfig-for-v3.17-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/defconfig
Merge "ARM: STi: defconfig changes for v3.17" from Maxime Coquelin:
STi defconfig updates for v3.17
- Enable ST's Thermal controller driver
- Enable ST's Keyscan driver
- Enable ST's MiPHY365 Phy driver for STiH416 SATA & PCIe
- Enable ST's AHCI driver.
* tag 'sti-defconfig-for-v3.17-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY
ARM: multi_v7_defconfig: Enable ST's (S)ATA driver
ARM: multi_v7_defconfig: add ST Keyscan driver
ARM: update multi_v7_defconfig for STI
ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
+ Linux 3.16-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/delayacct.c')
0 files changed, 0 insertions, 0 deletions