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

@ -103,4 +103,6 @@ source "drivers/auxdisplay/Kconfig"
source "drivers/uio/Kconfig"
source "drivers/xen/Kconfig"
source "drivers/staging/Kconfig"
endmenu