Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 13 Sep 2007 15:43:38 +0000 (08:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 13 Sep 2007 15:43:38 +0000 (08:43 -0700)
commit19299b1a722198830e39264a0f2edadd3fde74c2
tree987d546dd5fb9c278e9fa908c81e1e7699f0033f
parentf3da54ba140c6427fa4a32913e1bf406f41b5dda
parentd526875deb42e0f4c0d31cb50b4e5bfaf19c3138
Merge /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