David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

boot

microblaze: support U-BOOT image format

2009-12-14 08:44:59 +01:00

configs

microblaze: Defconfig update

2010-02-03 10:18:20 +01:00

include/asm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -07:00

kernel

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2010-03-18 16:57:24 -07:00

lib

microblaze: Simple __copy_tofrom_user for noMMU

2009-12-14 08:45:03 +01:00

mm

microblaze: PCI early support for noMMU system

2010-03-11 14:16:17 +01:00

oprofile

microblaze: Core oprofile configs and hooks

2009-12-14 08:45:07 +01:00

pci

microblaze: PCI early support for noMMU system

2010-03-11 14:16:17 +01:00

platform

microblaze: Use lowest-common-denominator default CPU settings

2009-12-14 08:45:02 +01:00

Kconfig

microblaze: Add consistent code

2010-03-11 14:14:43 +01:00

Kconfig.debug

microblaze: Add TRACE_IRQFLAGS_SUPPORT

2009-12-14 08:40:09 +01:00

Makefile

microblaze: Enable PCI, missing files

2010-03-11 14:04:27 +01:00