From: Linus Torvalds Date: Sat, 8 Nov 2008 18:22:00 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 X-Git-Tag: v2.6.28-rc4~12 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d8af8582c321414087ed46512ffe5ce4f5c9c5da;p=linux-2.6-omap-h63xx.git 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 --- d8af8582c321414087ed46512ffe5ce4f5c9c5da