From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 May 2013 04:39:01 +0000 (+0900)
Subject: Merge branch 'mn10300' (mn10300 fixes from David Howells)
X-Git-Tag: v3.10-rc4~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3.10.0-rc3upstream-00068-gdcdbe33;p=karo-tx-linux.git

Merge branch 'mn10300' (mn10300 fixes from David Howells)

Merge mn10300 fixes from David Howells.

* emailed patches from David Howells <dhowells@redhat.com>:
  MN10300: Need pci_iomap() and __pci_ioport_map() defining
  MN10300: ASB2305's PCI code needs the definition of XIRQ1
  MN10300: Enable IRQs more in system call exit work path
  MN10300: Fix ret_from_kernel_thread
---

dcdbe33add56cb659ebf21fb9b6577507e21d952