Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

masters

omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3

2010-02-15 09:27:02 -08:00

slaves

w1: ds2760_battery: add support for sleep mode feature

2009-06-08 23:25:17 +04:00

Kconfig

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

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

Makefile

…

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

…

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: add __init/__exit macros to w1.c

2010-02-05 12:22:32 +01:00

w1.h

w1: add touch block command

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