Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile
This commit is contained in:
David Vrabel 2008-10-20 16:07:19 +01:00
commit 61e0e79ee3
6522 changed files with 533196 additions and 168672 deletions

View file

@ -99,4 +99,5 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
obj-$(CONFIG_STAGING) += staging/
obj-$(CONFIG_UWB) += uwb/