David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
algos	i2c: Constify i2c_algorithm declarations, part 1	2006-09-26 15:38:52 -07:00
busses	i2c-i801: SMBus patch for Intel ICH9	2006-12-01 14:36:59 -08:00
chips	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
i2c-core.c	[PATCH] i2c: Prevent deadlock on i2c client registration	2006-09-30 10:58:47 -07:00
i2c-dev.c	I2C: convert i2c-dev to use struct device instead of struct class_device	2006-12-01 14:51:59 -08:00
Kconfig	i2c: Fix copy-n-paste in subsystem Kconfig	2006-09-26 15:38:51 -07:00
Makefile	[PATCH] hwmon: hwmon vs i2c, second round (07/11)	2005-09-05 09:14:22 -07:00