diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 21:09:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 21:09:18 +0200 |
| commit | 5fa77b54eff1e4fb38494b5a24c66768d6e7c148 (patch) | |
| tree | 73da68b86cdba0b1637207b9e0680ce65303a0d8 /arch/arm/mach-omap2/cm-regbits-34xx.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
| parent | Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel ... (diff) | |
| download | linux-5fa77b54eff1e4fb38494b5a24c66768d6e7c148.tar.xz linux-5fa77b54eff1e4fb38494b5a24c66768d6e7c148.zip | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Another round of fixes for ARM:
- a set of kprobes fixes from Jon Medhurst
- fix the revision checking for the L2 cache which wasn't noticed to
have been broken"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: l2c: fix revision checking
ARM: kprobes: Fix test code compilation errors for ARMv4 targets
ARM: kprobes: Disallow instructions with PC and register specified shift
ARM: kprobes: Prevent known test failures stopping other tests running
Diffstat (limited to 'arch/arm/mach-omap2/cm-regbits-34xx.h')
0 files changed, 0 insertions, 0 deletions