diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-30 17:13:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-30 17:13:13 -0800 |
| commit | 9bb29b6b927bcd79cf185ee67bcebfe630f0dea1 (patch) | |
| tree | 5b7913fe3a66f563088a7dd769bec31d6eb22654 /arch/microblaze | |
| parent | e4811a27842b4fa0d321d49de1b9d0534d05e455 (diff) | |
| parent | 007487f1fd43d84f26cda926081ca219a24ecbc4 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"A very small set of fixes for 3.19, as everyone was out.
The clocksource patch was something I missed for the merge window
after the change that broke arm64 was merged through arm-soc. The
other two patches are a fix for an undetected merge problem in mvebu
and a defconfig change to make some exynos boards work with the normal
multi_v7_defconfig"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
Add USB_EHCI_EXYNOS to multi_v7_defconfig
ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64
Diffstat (limited to 'arch/microblaze')
0 files changed, 0 insertions, 0 deletions