Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Sep 2006 05:59:32 +0000 (22:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Sep 2006 05:59:32 +0000 (22:59 -0700)
commitc972398b7871d9fb58c6a317786065a7cc6ca4be
treed83d783326f2c7204d8e1ff7812319e2be91be0c
parent2ff712585a5026a021859233fce145068292584d
parent6e3ce3ae8e872f2d3a30f5ce5bc3b7c5eeca4343
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: fix build error in ohci driver