黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
c2port
cb710
eeprom	at24: Use timeout also for read	2009-11-26 09:22:33 +01:00
hdpuftrs
ibmasm	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
sgi-gru	sgi-gru: decrapfiy options_write() function	2009-11-05 10:48:30 -08:00
sgi-xp	x86: uv: xpc NULL deref when mesq becomes empty	2010-12-09 13:27:15 -08:00
apanic.c	apanic start to write flash must be aligned to block	2010-09-29 16:03:12 +08:00
atmel_pwm.c
atmel_tclib.c
atmel-ssc.c
enclosure.c	SCSI: enclosure: fix error path - actually return ERR_PTR() on error	2010-08-10 10:20:44 -07:00
ep93xx_pwm.c
hpilo.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
hpilo.h
ics932s401.c
ioc4.c
isl29003.c
Kconfig	1,耳机按键；2，针对raho的震动(time 精度还不行)；3，modem控制驱动；4，一些log开关的修改	2010-10-13 12:22:33 +08:00
kernel_debugger.c	kernel_debugger_core: add interrupt-context debugger core	2010-02-08 15:35:54 -08:00
kgdbts.c
lkdtm.c
Makefile	1,耳机按键；2，针对raho的震动(time 精度还不行)；3，modem控制驱动；4，一些log开关的修改	2010-10-13 12:22:33 +08:00
phantom.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
pmem.c	delete pmem ioctl information	2010-08-10 12:52:55 +08:00
ste.c	1,耳机按键；2，针对raho的震动(time 精度还不行)；3，modem控制驱动；4，一些log开关的修改	2010-10-13 12:22:33 +08:00
tifm_7xx1.c
tifm_core.c
uid_stat.c	uidstat: Adding uid stat driver to collect network statistics.	2010-02-08 15:07:45 -08:00
wl127x-rfkill.c	wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips	2010-02-08 15:35:55 -08:00