Dmitry Torokhov b981d8b3f5 Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/macintosh/adbhid.c		2007-10-12 21:27:47 -04:00
..
ams-core.c	hwmon: clean up duplicate includes	2007-07-30 21:05:26 -04:00
ams-i2c.c
ams-input.c	HWMON: ams - convert to use input-polldev	2007-09-26 00:01:41 -04:00
ams-pmu.c
ams.h	HWMON: ams - convert to use input-polldev	2007-09-26 00:01:41 -04:00
Makefile