diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 14:56:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 14:56:56 -0700 |
| commit | 30a5c1894a4c932f5a417f0a6ec369c7da81204b (patch) | |
| tree | bdcc76efc154539409470f8c6c11fefca22aeed8 /.gitignore | |
| parent | 77e3c09e451ae78b64f7b89fc1690804da726787 (diff) | |
| parent | a11176e65b8727158bc355ca0cb00bf70cd69e48 (diff) | |
| download | linux-30a5c1894a4c932f5a417f0a6ec369c7da81204b.tar.bz2 | |
Merge tag 'samsung-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
Merge "Samsung non-critical fixes for v4.1" from Kukjin Kim:
- mostly trivial build fixes with random configurations
from Arnd Bergmann
for s3c24xx:
avoid a Kconfig warning and fix header file inclusions,
and fix building without PM_SLEEP and use SAMSUNG_WAKEMASK
for s3c64xx:
fix __initdata section mismatch and add I2C dependencies,
and fix building with PM_SLEEP
* tag 'samsung-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: avoid a Kconfig warning
ARM: S3C24XX: fix header file inclusions
ARM: S3C24XX: fix building without PM_SLEEP
ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
ARM: S3C64XX: fix __initdata section mismatch
ARM: S3C64XX: fix building without CONFIG_PM_SLEEP
ARM: S3C64XX: add I2C dependencies where needed
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions