projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b55eab 1aeeac7)
Merge branch 'mn10300' (mn10300 fixes from David Howells)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 May 2013 04:39:01 +0000 (13:39 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 May 2013 04:39:01 +0000 (13:39 +0900)
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


Trivial merge