| commit | 6e76538b9ef2b2a14ad9b57d65dc35d151765917 | |
| author | Olof Johansson <olof@lixom.net> | |
| Fri, 27 Apr 2012 16:40:06 +0000 (27 09:40 -0700) | ||
| committer | Olof Johansson <olof@lixom.net> | |
| Fri, 27 Apr 2012 16:40:06 +0000 (27 09:40 -0700) | ||
| tree | abb95e720792583a5656137650eb0549c8967c10 | treesnapshot (tar.gz zip) |
| parent | dadb3660a3ad162ac6e76be7262c72f48177f1aa | commitdiff |
| parent | 9b4d1cbb1391ae603c20cbf8c0beb66e38397196 | commitdiff |
Merge branch 'v3.4-samsung-fixes-3' of git://git./linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined
ARM: EXYNOS: Fix resource on dev-dwmci.c
ARM: S3C24XX: Fix build warning for S3C2410_PM
ARM: mini2440_defconfig: Fix build error
ARM: EXYNOS: Fix incorrect initialization of GIC
ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers
* 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined
ARM: EXYNOS: Fix resource on dev-dwmci.c
ARM: S3C24XX: Fix build warning for S3C2410_PM
ARM: mini2440_defconfig: Fix build error
ARM: EXYNOS: Fix incorrect initialization of GIC
ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers