diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-28 21:45:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-28 21:45:22 +0100 |
| commit | 5263bf65d6342e12ab716db8e529501670979321 (patch) | |
| tree | 575a714f55e6b05443c182df2673392ea2865fea /net/sctp | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [POWERPC] Fix sys_pciconfig_iobase bus matching (diff) | |
| download | linux-5263bf65d6342e12ab716db8e529501670979321.tar.xz linux-5263bf65d6342e12ab716db8e529501670979321.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix sys_pciconfig_iobase bus matching
[POWERPC] PS3: add not complete comment to kconfig
[POWERPC] ps3_free_io_irq: Fix inverted error check
[POWERPC] PS3: Fix uniprocessor kernel build
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions