Greg Kroah-Hartman 7da59d2fe3 Merge v3.6-rc3 into 'char-misc-next' ...

This resolves a conflict in:
	drivers/misc/mei/interrupt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-08-27 09:09:07 -07:00

..

masters

onewire: w1-gpio: add ext_pullup_enable pin in platform data

2012-08-16 10:02:33 -07:00

slaves

1-Wire: Add support for the maxim ds1825 temperature sensor

2012-08-16 12:33:59 -07:00

Kconfig

Kconfig: replace "--- help ---" with "---help---"

2012-05-07 15:01:22 +02:00

Makefile

[PATCH] better CONFIG_W1_SLAVE_DS2433_CRC handling

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

w1_family.c

drivers/w1: Add export.h for EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:32:00 -04:00

w1_family.h

1-Wire: Add support for the maxim ds1825 temperature sensor

2012-08-16 12:33:59 -07:00

w1_int.c

w1: Fix a typo in 'hardware' word

2012-06-18 16:41:06 -07:00

w1_int.h

MAINTAINERS: Evgeniy has moved

2011-08-25 16:25:33 -07:00

w1_io.c

w1: Disable irqs during 1-wire bus operations, extend 1-wire reset pulse

2012-04-11 16:44:10 -07:00

w1_log.h

MAINTAINERS: Evgeniy has moved

2011-08-25 16:25:33 -07:00

w1_netlink.c

MAINTAINERS: Evgeniy has moved

2011-08-25 16:25:33 -07:00

w1_netlink.h

MAINTAINERS: Evgeniy has moved

2011-08-25 16:25:33 -07:00

w1.c

W1: split master mutex to avoid deadlocks.

2012-06-13 16:38:40 -07:00

w1.h

W1: split master mutex to avoid deadlocks.

2012-06-13 16:38:40 -07:00