David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
4xx	ppc: Various minor compile fixes	2005-10-11 22:08:12 +10:00
8xx	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
82xx	[HEADERS] Put linux/config.h out of its misery.	2006-10-09 19:13:51 -04:00
83xx	Fix misc Kconfig typos	2006-11-30 05:22:59 +01:00
85xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
86xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
apus	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
cell	[POWERPC] Fix cell "new style" mapping and add debug	2006-11-10 21:35:36 +11:00
chrp	[POWERPC] Fix CHRP platforms with only 8259	2006-10-25 13:49:22 +10:00
embedded6xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
iseries	[POWERPC] Use 4kB iommu pages even on 64kB-page systems	2006-11-01 14:52:48 +11:00
maple	[POWERPC] Fix Maple secondary IDE interrupt	2006-10-10 11:54:26 +10:00
pasemi	[PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)	2006-10-09 14:19:08 -07:00
powermac	PCI: Delete unused extern in powermac/pci.c	2006-12-01 14:36:57 -08:00
prep	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
pseries	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
Makefile	[POWERPC] powerpc: PA Semi PWRficient platform support	2006-09-13 18:39:53 +10:00