diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:25:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:25:37 -0700 |
| commit | 32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b (patch) | |
| tree | b095b022c36d61ae5326d3468e937e59cc1576a6 /net/sctp | |
| parent | a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (diff) | |
| parent | 0203d6ec4e88062f20558fbed3cdff2af758a53b (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: Fix setting of oprofile cpu type
powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
powerpc adjust oprofile_cpu_type version 3
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions