linux_old1/drivers/misc
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
..
c2port c2port: annotate bitfield for kmemcheck 2009-06-15 15:49:34 +02:00
cb710 cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG 2009-07-31 12:28:46 +02:00
eeprom max6875: Discard obsolete detect method 2009-10-04 22:53:41 +02:00
hdpuftrs hdpuftrs: fix build 2008-10-30 11:38:46 -07:00
ibmasm headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
iwmc3200top iwmc3200top: simplify the driver version 2009-11-15 22:08:31 -08:00
sgi-gru sgi-gru: decrapfiy options_write() function 2009-11-05 10:48:30 -08:00
sgi-xp Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 2009-09-18 09:33:07 -07:00
Kconfig iwmc3200top: Add Intel Wireless MultiCom 3200 top driver. 2009-10-19 23:22:50 -07:00
Makefile iwmc3200top: Add Intel Wireless MultiCom 3200 top driver. 2009-10-19 23:22:50 -07: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 driver model: constify attribute groups 2009-09-15 09:50:47 -07:00
ep93xx_pwm.c ARM: 5628/1: ep93xx: Introduce Pulse Width Modulator (PWM) driver 2009-07-30 17:45:43 +01:00
hpilo.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
hpilo.h hpilo: add interrupt handler 2009-09-15 09:50:48 -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 kprobes: use do_IRQ() in lkdtm 2009-09-23 07:39:27 -07:00
phantom.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07: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