Linus Torvalds 0e65ae099c Miscellaneous Itanium patches ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJPa7EVAAoJEKurIx+X31iBADgP/1eHhyb4A2ULOk19MhrEAb3/ myoz76qVZvFC7i/5kmtkpAZqCYNnNfiBzr0vpd6MNq9mgFx5jna/IiaV8cZ08kcj JPknyrAoK8IgGgVQmi+pSHoaiNRAjnvkLwBsadLSFGmcjpi1BYlzmQrFYvMh5GAN J6j7+2Sv2YNec2QthZZ56L29QqQnbzg0DfS6ZTcOLSvitCnAsUb54Hoi/saK1c9r loUdWeVen8FPBSTfyqFtJLWJj1Yo3KxVoUgME+f7TeBQNRfihzDhMLuK+IQ5Bsp5 /Z4+Pi4MxiTccYETWCLFWyS9cheK7tfR/SOpEd+XQYx7BQ2gLp/WMNd3q1iUTsg+ AXr3/XOtmKWKAlu6Wy/oFUOjokPVm/yl9MSB6Io1bmlYfaCmb8I+Eyr+fJzPKLyI wVd+SQl02Z2PlC9dnr73Wu+bCrx0u9xQncucNEpZIpBZLGeuU0sPP0Y7nCGAOL5C NL7yQmb45pvT7kvzBfrrFSqEfWccycIL+CJw9kb+k1aspTxT0YBZPbpNTKj83aXW H4KAF9Av/ZHeacriDpxrywwMtTsTS/xLhxEdHB/XEzjkGLuB0R7ZlzvTSuLBbm/1 fu8/bty4ehOHRqACIuNNMGbdIZ5ruThylSC4Yx2a3JRIJISZS/Bo/0mU5zLRRaH+ XuEw3+mfhLq9oU8SdAug =78St -----END PGP SIGNATURE----- Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux Pull miscellaneous Itanium patches from Tony Luck. The conflicts in arch/ia64/hp/sim/simserial.c were due to patches to simserial that had alredy been included (with lots of further cleanups) in the serial tree. * tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: Documentation/kernel-parameters: remove inttest parameter [IA64] Fix ISA IRQ trigger model and polarity setting [IA64] Fix a couple of warnings for EXPORT_SYMBOL [IA64] Check return from device_register() in cx_device_register() [IA64] Fix warning from machine_kexec.c [IA64] simserial, bail out when request_irq fails [IA64] hpsim, initialize chip for assigned irqs [IA64] simserial, include some headers [IA64] hpsim, fix SAL handling in fw-emu [IA64] genirq fixup for SGI/SN [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler()		2012-03-23 17:19:37 -07:00
..
sn2	[IA64] Fix a couple of warnings for EXPORT_SYMBOL	2012-02-27 16:20:09 -08:00
bte_error.c	[IA64] Fix Altix BTE error return status	2007-12-19 11:19:19 -08:00
bte.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
huberror.c	[IA64] genirq fixup for SGI/SN	2012-02-22 11:11:06 -08:00
idle.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
io_acpi_init.c	ia64: Add export.h to arch/ia64 specific files as required	2011-10-31 19:30:58 -04:00
io_common.c	[IA64] Fix a couple of warnings for EXPORT_SYMBOL	2012-02-27 16:20:09 -08:00
io_init.c	ia64/PCI: get rid of device resource fixups	2012-02-23 20:19:02 -07:00
iomv.c	[IA64] Move include/asm-ia64 to arch/ia64/include/asm	2008-08-01 10:21:21 -07:00
irq.c	[IA64] genirq fixup for SGI/SN	2012-02-22 11:11:06 -08:00
klconflib.c	[IA64-SGI] sn2 housekeeping	2006-02-02 13:35:59 -08:00
machvec.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
mca.c	[IA64] remove remaining __FUNCTION__ occurrences	2008-03-06 09:19:27 -08:00
msi_sn.c	ia64: Convert to the new irq_* function names	2011-03-29 14:48:05 +02:00
pio_phys.S	[IA64-SGI] - Eliminate SN pio_phys_xxx macros. Move to assembly	2006-02-07 09:24:14 -08:00
setup.c	[IA64] setup.c Typo fix "Architechtuallly"	2011-03-02 14:00:11 -08:00
tiocx.c	[IA64] Check return from device_register() in cx_device_register()	2012-02-27 13:01:42 -08:00