diff options
| author | Linus Torvalds <[email protected]> | 2008-12-05 05:44:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-12-05 05:44:03 +0000 |
| commit | 341e55805d671948c2a93d3d6c7e9babb47de5d8 (patch) | |
| tree | 62ad370e5735147194d8f3e3ace8a3ff0d64e61b /net/unix/af_unix.c | |
| parent | ACPI: Fix ACPI battery regression introduced by commit 558073 (diff) | |
| parent | powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs (diff) | |
| download | kernel-341e55805d671948c2a93d3d6c7e9babb47de5d8.tar.gz kernel-341e55805d671948c2a93d3d6c7e9babb47de5d8.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions