David Vrabel 61e0e79ee3 Merge branch 'master' into for-upstream
Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile
2008-10-20 16:07:19 +01:00
..
2007-07-12 16:34:42 -07:00
2005-04-16 15:20:36 -07:00
2006-11-30 05:21:10 +01:00
2005-04-16 15:20:36 -07:00
2008-02-01 14:34:47 -08:00
2005-04-16 15:20:36 -07:00
2006-10-03 22:55:17 +02:00
2005-04-16 15:20:36 -07:00
2006-11-30 04:55:36 +01:00
2006-10-03 22:55:17 +02:00