David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -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-11-18 22:19:03 -08:00
kernel	powerpc: Avoid giving out RTC dates below EPOCH	2009-11-05 17:06:21 +11:00
kvm	powerpc/kvm: Remove problematic BUILD_BUG_ON statement	2009-11-05 17:10:34 +11:00
lib	…
math-emu	…
mm	powerpc/mm: Remove debug context clamping from nohash code	2009-11-05 16:41:59 +11:00
oprofile	…
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	…
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