tree 816afd4b4d43bfa73c8cd65867a1c264a044a41c
parent c5d712433ff57a66d8fb79a57a4fc7a7c3467b97
parent b8f6ec2e61f650fd1a316a207a00965bcb8805d4
author Linus Torvalds <torvalds@linux-foundation.org> 1226168520 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226168520 -0800

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: make usbip depend on CONFIG_NET
  Staging: only build the tree if we really want to