diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:30:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:30:06 -0800 |
commit | e78ac4b9deb8f36d8c828b6d91232960f109d951 (patch) | |
tree | 09d0eb38a666071bc90a8637cd0501ecc152cda0 /include/net/netfilter/nf_conntrack.h | |
parent | 29a0c5ce5d008f398346d644456d62ab300d5e10 (diff) | |
parent | a0490fa35dc0022ef95f64802e8edf18c411c790 (diff) |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: cpu hotplug fix
Diffstat (limited to 'include/net/netfilter/nf_conntrack.h')
0 files changed, 0 insertions, 0 deletions