diff options
| author | Linus Torvalds <[email protected]> | 2008-12-09 16:26:43 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-12-09 16:26:43 +0000 |
| commit | cdf0c7de29a87cc600ef367893523ea15938da4e (patch) | |
| tree | 00997f8ea89c0bfe7a1f23f12a6780f6319bb542 /net/unix/af_unix.c | |
| parent | radeonfb: Disable new color expand acceleration unless explicitely enabled (diff) | |
| parent | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/pow... (diff) | |
| download | kernel-cdf0c7de29a87cc600ef367893523ea15938da4e.tar.gz kernel-cdf0c7de29a87cc600ef367893523ea15938da4e.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/virtex5: Fix Virtex5 machine check handling
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions