Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 06:09:42 +0000 (23:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 06:09:42 +0000 (23:09 -0700)
commit5fa21d821f6972e70942f2c555ec29dde962bdb2
treefbe0a083ce7fc7ddb58cd452d5598662acac325b
parent8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6
parent5d9fd169c9fbdaecdc430431e59bf94ff40b93d3
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  [PATCH] Driver core: fix locking issues with the devices that are attached to classes
  [PATCH] USB: get USB suspend to work again