]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3da54b d526875)
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)
* 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


Trivial merge
Linux 2.6 source tree