Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
sn2	ia64: change to new flag variables	2011-03-17 14:02:56 +01: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] minor irq handler cleanups	2008-04-22 08:56:58 -07:00
idle.c
io_acpi_init.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
io_common.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
io_init.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
iomv.c	[IA64] Move include/asm-ia64 to arch/ia64/include/asm	2008-08-01 10:21:21 -07:00
irq.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
klconflib.c	[IA64-SGI] sn2 housekeeping	2006-02-02 13:35:59 -08:00
machvec.c
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	pci: Convert msi to new irq_chip functions	2010-10-12 16:53:34 +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] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00