projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5d7124 b8f6ec2)
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)
* 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


Trivial merge
John Crispins staging tree