diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-30 06:39:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-30 06:39:01 +0200 |
commit | dcdbe33add56cb659ebf21fb9b6577507e21d952 (patch) | |
tree | 928b048cc5a189803a7735e95ce6b449c6c39924 /arch/arm/mach-omap2/board-rx51.c | |
parent | Merge tag 'pinctrl-fixes-v3.10-3' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | MN10300: Need pci_iomap() and __pci_ioport_map() defining (diff) | |
download | linux-dcdbe33add56cb659ebf21fb9b6577507e21d952.tar.xz linux-dcdbe33add56cb659ebf21fb9b6577507e21d952.zip |
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
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
0 files changed, 0 insertions, 0 deletions