diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 00:41:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 00:41:15 (GMT) |
| commit | a771132783d3f78a51597fdcee96c6dfbae3512e (patch) | |
| tree | 3d3210a247e673b44e64a04b2c94d68126d73872 /net/socket.c | |
| parent | 2433c41789d6aa6797ca747707b7764e88e4fb6d (diff) | |
| parent | dafdb61313e80e20cfeef7bf4653dcb47cf28591 (diff) | |
| download | linux-a771132783d3f78a51597fdcee96c6dfbae3512e.tar.xz | |
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/83xx: Fix MCU support merge issue in mpc8349emitx.dts
powerpc: Fix dma_map_sg() cache flushing on non coherent platforms
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions