黄涛 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

..

masters

ds2482: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

slaves

w1: w1 temp: fix negative termperature calculation

2010-05-12 14:57:00 -07:00

Kconfig

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

Makefile

[PATCH] better CONFIG_W1_SLAVE_DS2433_CRC handling

2006-12-07 08:39:43 -08:00

w1_family.c

W1: w1_family, remove unused variable need_exit

2008-10-16 11:21:50 -07:00

w1_family.h

w1: new driver. DS2431 chip

2008-10-16 11:21:51 -07:00

w1_int.c

w1: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:34 -08:00

w1_int.h

[PATCH] w1: cleanups.

2005-06-21 21:43:09 -07:00

w1_io.c

w1: coding style cleanups in w1_io.c

2009-04-02 19:05:04 -07:00

w1_log.h

drivers: replace remaining __FUNCTION__ occurrences

2008-04-30 08:29:53 -07:00

w1_netlink.c

connector: Provide the sender's credentials to the callback

2009-10-02 10:54:01 -07:00

w1_netlink.h

w1: send status messages after command processing

2009-01-08 08:31:14 -08:00

w1.c

w1: don't allow arbitrary users to remove w1 devices

2010-02-03 21:27:00 -08:00

w1.h

w1: add touch block command

2009-01-08 08:31:13 -08:00