Russell King 14b6848bc0 Merge branch 'omap-clks3' into devel ...

Conflicts:

	arch/arm/mach-omap2/clock.c

2009-03-19 12:39:58 +00:00

..

masters

Merge branch 'omap-clks3' into devel

2009-03-19 12:39:58 +00:00

slaves

w1: add missing Kconfig/Makefile entries for DS2431 slave driver

2009-02-27 16:26:21 -08:00

Kconfig

…

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: add touch block command

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

w1_log.h

drivers: replace remaining __FUNCTION__ occurrences

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

w1_netlink.c

w1: send status messages after command processing

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

w1_netlink.h

w1: send status messages after command processing

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

w1.c

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

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

w1.h

w1: add touch block command

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