diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-07 20:20:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-07 20:20:59 +0200 |
| commit | cd6407fe220c5cf26c117457f5bcdfd6a81fbef8 (patch) | |
| tree | ad7ba1b762935cd914bb2f2f1af40238cbeb20cb /kernel | |
| parent | Merge tag 'ecryptfs-3.5-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: fix warning caused by wrongly typed arm_dma_limit (diff) | |
| download | linux-cd6407fe220c5cf26c117457f5bcdfd6a81fbef8.tar.xz linux-cd6407fe220c5cf26c117457f5bcdfd6a81fbef8.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Last merge window, we had some updates from Al cleaning up the signal
restart handling. These have caused some problems on ARM, and while
Al has some fixes, we have some concerns with Al's patches but we've
been unsuccesful with discussing this.
We have got to the point where we need to do something, and we've
decided that the best solution is to revert the appropriate commits
until Al is able to reply to us.
Also included here are four patches to fix warnings that I've noticed
in my build system, and one fix for kprobes test code."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: fix warning caused by wrongly typed arm_dma_limit
ARM: fix warnings about atomic64_read
ARM: 7440/1: kprobes: only test 'sub pc, pc, #1b-2b+8-2' on ARMv6
ARM: 7441/1: perf: return -EOPNOTSUPP if requested mode exclusion is unavailable
ARM: 7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK"
ARM: 7442/1: Revert "remove unused restart trampoline"
ARM: fix set_domain() macro
ARM: fix mach-versatile/pci.c warning
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions