From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2015 16:34:10 +0000 (-0700)
Subject: Merge tag 'microblaze-4.0-rc4' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: v4.0-rc4~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d3dd73fc9eaa81348f21c6ec33d531fa0397b7bf;p=linux-2.6-block.git

Merge tag 'microblaze-4.0-rc4' of git://git.monstr.eu/linux-2.6-microblaze

Pull arch/microblaze fixes from Michal Simek:
 "Fix syscall error recovery.

  Two patches - one is just preparation patch for the second which is
  fixing the problem with syscalls"

* tag 'microblaze-4.0-rc4' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix syscall error recovery for invalid syscall IDs
  microblaze: Coding style cleanup
---

d3dd73fc9eaa81348f21c6ec33d531fa0397b7bf