diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 10:22:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 10:22:00 -0800 |
| commit | d8af8582c321414087ed46512ffe5ce4f5c9c5da (patch) | |
| tree | 816afd4b4d43bfa73c8cd65867a1c264a044a41c /arch/x86/oprofile/op_model_ppro.c | |
| parent | c5d712433ff57a66d8fb79a57a4fc7a7c3467b97 (diff) | |
| parent | b8f6ec2e61f650fd1a316a207a00965bcb8805d4 (diff) | |
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
Diffstat (limited to 'arch/x86/oprofile/op_model_ppro.c')
0 files changed, 0 insertions, 0 deletions