summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-08 10:10:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-08 10:10:18 -0800
commit9d2bc1a4ccc0da617bab6bba3278705e894365ca (patch)
tree9e31c23dd4802b18cabef125b06d3748b8751171 /net
parent8bd73803e18354add19b050d05770b646ecbffd0 (diff)
parent36350e00696df148507246c817cf6f86329479fd (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pseries: Fix kexec regression caused by CPPR tracking
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions