Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Nov 2008 18:22:00 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Nov 2008 18:22:00 +0000 (10:22 -0800)
commitd8af8582c321414087ed46512ffe5ce4f5c9c5da
tree816afd4b4d43bfa73c8cd65867a1c264a044a41c
parentc5d712433ff57a66d8fb79a57a4fc7a7c3467b97
parentb8f6ec2e61f650fd1a316a207a00965bcb8805d4
Merge git://git./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