Linus Torvalds 40d7ee5d16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits) uio: make uio_info's name and version const UIO: Documentation for UIO ioport info handling UIO: Pass information about ioports to userspace (V2) UIO: uio_pdrv_genirq: allow custom irq_flags UIO: use pci_ioremap_bar() in drivers/uio arm: struct device - replace bus_id with dev_name(), dev_set_name() libata: struct device - replace bus_id with dev_name(), dev_set_name() avr: struct device - replace bus_id with dev_name(), dev_set_name() block: struct device - replace bus_id with dev_name(), dev_set_name() chris: struct device - replace bus_id with dev_name(), dev_set_name() dmi: struct device - replace bus_id with dev_name(), dev_set_name() gadget: struct device - replace bus_id with dev_name(), dev_set_name() gpio: struct device - replace bus_id with dev_name(), dev_set_name() gpu: struct device - replace bus_id with dev_name(), dev_set_name() hwmon: struct device - replace bus_id with dev_name(), dev_set_name() i2o: struct device - replace bus_id with dev_name(), dev_set_name() IA64: struct device - replace bus_id with dev_name(), dev_set_name() i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name() infiniband: struct device - replace bus_id with dev_name(), dev_set_name() ISDN: struct device - replace bus_id with dev_name(), dev_set_name() ...		2009-01-06 17:02:07 -08:00
..
arch-v10	[CRIS] Remove links from CRIS build	2008-10-31 23:37:57 +01:00
arch-v32	chris: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:42 -08:00
configs	CRIS: proper defconfig setup	2008-10-13 21:34:55 +02:00
include	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
kernel	take init_fs to saner place	2008-12-31 18:07:42 -05:00
mm	[CRIS] Move header files from include to arch/cris/include.	2008-10-29 17:29:44 +01:00
Kconfig	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2008-10-23 08:20:34 -07:00
Kconfig.debug	[PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug	2005-09-05 00:06:19 -07:00
Makefile	[CRIS] Remove links from CRIS build	2008-10-31 23:37:57 +01:00