tree 987d546dd5fb9c278e9fa908c81e1e7699f0033f
parent f3da54ba140c6427fa4a32913e1bf406f41b5dda
parent d526875deb42e0f4c0d31cb50b4e5bfaf19c3138
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189698218 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189698218 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  Revert "usb-storage: implement autosuspend"
  USB: disable autosuspend by default for non-hubs