diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-15 00:28:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-15 00:28:13 (GMT) |
| commit | 2f7989efd4398d92b8adffce2e07dd043a0895fe (patch) | |
| tree | 8acbc880a8908ea18d724f747ea26d0afc2160bf /arch/arm/mach-clps711x/clep7312.c | |
| parent | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (diff) | |
| parent | 0ebe25f90cd99bb1bcf622ec8a841421d48380d6 (diff) | |
| download | linux-fsl-qoriq-2f7989efd4398d92b8adffce2e07dd043a0895fe.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6226/1: fix kprobe bug in ldr instruction emulation
ARM: Update mach-types
ARM: lockdep: fix unannotated irqs-on
ARM: 6184/2: ux500: use neutral PRCMU base
ARM: 6212/1: atomic ops: add memory constraints to inline asm
ARM: 6211/1: atomic ops: fix register constraints for atomic64_add_unless
ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL
Diffstat (limited to 'arch/arm/mach-clps711x/clep7312.c')
0 files changed, 0 insertions, 0 deletions