David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/net/pcmcia/fmvj18x_cs.c drivers/net/pcmcia/nmclan_cs.c drivers/net/pcmcia/xirc2ps_cs.c drivers/net/wireless/ray_cs.c		2009-12-05 15:22:26 -08:00
..
boot	Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc	2009-11-17 09:14:49 -08:00
configs	powerpc: pasemi_defconfig update	2009-11-11 15:44:02 +11:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
kernel	swiotlb: Defer swiotlb init printing, export swiotlb_print_info()	2009-11-10 12:32:00 +01:00
kvm	powerpc/kvm: Remove problematic BUILD_BUG_ON statement	2009-11-05 17:10:34 +11:00
lib	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	powerpc/mm: Remove debug context clamping from nohash code	2009-11-05 16:41:59 +11:00
oprofile	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
platforms	powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe()	2009-11-05 07:18:00 -06:00
sysdev	powerpc: Change archdata dma_data to a union	2009-09-24 15:31:43 +10:00
xmon	powerpc/booke: Fix xmon single step on PowerPC Book-E	2009-10-27 16:42:40 +11:00
Kconfig	powerpc: Cleanup Kconfig selection of hugetlbfs support	2009-10-30 15:03:54 +11:00
Kconfig.debug	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Makefile	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00