David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
c2port	misc: C2port needs <linux/sched.h>	2008-11-15 11:36:06 -08:00
cb710	cb710: more cleanup for the DEBUG case.	2009-06-13 22:42:59 +02:00
eeprom	at25: make input buffers of at25_*write() const	2009-04-13 15:04:32 -07:00
hdpuftrs	hdpuftrs: fix build	2008-10-30 11:38:46 -07:00
ibmasm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-01-07 11:31:52 -08:00
sgi-gru	sgi-xp/sgi-gru: allow modules to load on non-uv systems	2009-04-21 13:41:50 -07:00
sgi-xp	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
Kconfig	mmc: Driver for CB710/720 memory card reader (MMC part)	2009-06-13 22:42:58 +02:00
Makefile	mmc: Driver for CB710/720 memory card reader (MMC part)	2009-06-13 22:42:58 +02:00
atmel-ssc.c	atmel-ssc: fix misuse of dev_dbg when requested ssc instance is not found	2009-02-05 12:56:48 -08:00
atmel_pwm.c	atmel_pwm: set up only one PWM clock when allocating a clock	2008-07-24 10:47:25 -07:00
atmel_tclib.c	atmel_tc library	2008-03-04 13:41:23 +01:00
enclosure.c	[SCSI] ses: fix problems caused by empty SES provided name	2009-05-15 12:20:57 -04:00
hpilo.c	hpilo: reduce frequency of IO operations	2009-04-01 08:59:18 -07:00
hpilo.h	hpilo: reduce frequency of IO operations	2009-04-01 08:59:18 -07:00
ics932s401.c	ics932s401: new clock generator chip driver	2008-11-12 17:17:18 -08:00
ioc4.c	ioc4: automatically load sgiioc4 subordinate module	2009-01-06 15:59:13 -08:00
isl29003.c	isl29003: fix resume functionality	2009-05-06 16:36:10 -07:00
kgdbts.c	kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA	2008-05-28 12:49:57 -05:00
lkdtm.c	NULL noise: drivers/misc	2008-03-30 14:18:41 -07:00
phantom.c	trivial: fix an -> a typos in documentation and comments	2009-01-06 11:28:07 +01:00
tifm_7xx1.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
tifm_core.c	tifm: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:35 -08:00