Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Apr 2012 15:25:23 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Apr 2012 15:25:23 +0000 (08:25 -0700)
commit20a2a811602b16c42ce88bada3d52712cdfb988b
treef2a30a383c47336b0352ed473abafc0cdca4ca2c
parenta92bc5a65ce966ccc49bc8e37c6714c0b4042818
parent6d008893e45ad5957a9a31afa00c4c6582504fe5
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