Russell King 14b6848bc0 Merge branch 'omap-clks3' into devel ... Conflicts: arch/arm/mach-omap2/clock.c		2009-03-19 12:39:58 +00:00
..
ds1wm.c	W1: ds1wm.c msleep for reset	2008-10-16 11:21:50 -07:00
ds2482.c	w1/ds2482: Convert to a new-style driver	2008-07-16 19:30:07 +02:00
ds2490.c	W1: ds2490.c optimize ds_set_pullup	2008-10-16 11:21:51 -07:00
Kconfig	w1: add 1-wire master driver for i.MX27 / i.MX31	2009-01-08 08:31:13 -08:00
Makefile	w1: add 1-wire master driver for i.MX27 / i.MX31	2009-01-08 08:31:13 -08:00
matrox_w1.c	Clean up duplicate includes in drivers/w1/	2007-10-17 08:42:48 -07:00
mxc_w1.c	[ARM] MXC: remove _clk suffix from clock names	2009-03-13 10:33:48 +01:00
omap_hdq.c	[ARM] omap: w1: convert omap HDQ clocks to match by devid and conid	2009-02-08 17:50:21 +00:00
w1-gpio.c	w1-gpio: add GPIO w1 bus master driver	2008-02-06 10:41:15 -08:00