Colin Cross 98959c8563 Merge branch 'android-2.6.36' into android-tegra-2.6.36 ... Conflicts: drivers/input/touchscreen/Kconfig Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02		2010-10-06 16:32:09 -07:00
..
masters	w1: master: tegra_w1: Add initial Tegra W1 master driver	2010-10-06 16:27:02 -07:00
slaves	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07: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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09: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
w1_netlink.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09: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-09-29 17:49:05 -07:00
w1.h	w1: add touch block command	2009-01-08 08:31:13 -08:00