diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 11:49:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 11:49:23 +0100 |
| commit | 4208c471995f90479cd129b15cd459b4a7eaebb3 (patch) | |
| tree | 109cab7b23707ccb2103e0bebaab772a2a002f40 /drivers/infiniband/hw/ocrdma/ocrdma_main.c | |
| parent | 88829dfe4b6ea0c1c24d415668b3bfa78e5a5b16 (diff) | |
| parent | 08ddbb0a899a4e7a9214bc7c063be436cabbc52a (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"There's really only one bugfix in this branch, which is a fix for
timers on the integrator platform. Since Linus Walleij is
resurrecting support for the platform it seems valuable to get the fix
into 3.12 even though the regression has been around a while.
The rest are a handful of maintainers updates. If you prefer to hold
those until 3.13 then just merge the first patch on the branch which
is the fix"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: Add maintainers entry for Rockchip SoCs
MAINTAINERS: Tegra updates, and driver ownership
MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
ARM: integrator: deactivate timer0 on the Integrator/CP
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_main.c')
0 files changed, 0 insertions, 0 deletions