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
..
Makefile	IDE: Fix platform device registration in Swarm IDE driver (v2)	2008-10-05 18:23:28 +02:00
platform.c	net/sb1250: setup the pdevice within the soc code	2010-04-27 15:54:50 -07:00
rtc_m41t81.c	mips: use bcd2bin/bin2bcd	2008-10-20 08:52:41 -07:00
rtc_xicor1241.c	mips: use bcd2bin/bin2bcd	2008-10-20 08:52:41 -07:00
setup.c	MIPS: Fixup screen_info struct initializations	2010-04-30 20:52:42 +01:00
swarm-i2c.c	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00