David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c		2010-05-12 00:05:35 -07:00
..
boot	microblaze: Makefile cleanups	2010-04-01 08:38:19 +02:00
configs	microblaze: Defconfig update	2010-05-06 11:37:42 +02:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
kernel	microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros	2010-05-06 11:22:00 +02:00
lib	microblaze: Support word copying in copy_tofrom_user	2010-04-01 08:38:25 +02:00
mm	microblaze: Fix consistent-sync code	2010-05-06 11:22:00 +02:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	microblaze: resource/PCI: align functions now return start of resource	2010-05-06 11:21:57 +02:00
platform	microblaze: Use lowest-common-denominator default CPU settings	2009-12-14 08:45:02 +01:00
Kconfig	microblaze: Kconfig Fix - pci	2010-04-01 08:38:24 +02:00
Kconfig.debug	microblaze: Add TRACE_IRQFLAGS_SUPPORT	2009-12-14 08:40:09 +01:00
Makefile	microblaze: Fix Makefile to delete build generated files	2010-04-01 08:38:19 +02:00