diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 23:07:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 23:07:54 -0500 |
commit | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (patch) | |
tree | 7b6da4d31ab802a4d8feddea39d5cac9edfe3c1c /kernel/cgroup.c | |
parent | 1811534a80697b34add31cff53a321cfc291ddfe (diff) | |
parent | b1812582ba94b5f377d5d3cec7646cc17d84e733 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Fix static rate if path faster than link
IPoIB: Fix oops if xmit is called when priv->broadcast is NULL
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions