| commit | 20a2a811602b16c42ce88bada3d52712cdfb988b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 04 08:25:23 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 04 08:25:23 2012 -0700 |
| tree | f2a30a383c47336b0352ed473abafc0cdca4ca2c | |
| parent | a92bc5a65ce966ccc49bc8e37c6714c0b4042818 [diff] | |
| parent | 6d008893e45ad5957a9a31afa00c4c6582504fe5 [diff] |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Pull ARM fixes from Russell King: "Nothing too big here, just small fixes." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM) ARM: fix bios32.c build warning ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms ARM: fix missing bug.h include in arch/arm/kernel/insn.c ARM: sa11x0: fix build errors from DMA engine API updates