diff options
| author | Greg Kroah-Hartman <[email protected]> | 2012-01-06 19:42:52 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-01-06 19:42:52 +0000 |
| commit | ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df (patch) | |
| tree | d851c923f85566572112d4c0f884cff388a3cc05 /net/unix/af_unix.c | |
| parent | Linux 3.2 (diff) | |
| parent | arm: fix up some samsung merge sysdev conversion problems (diff) | |
| download | kernel-ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df.tar.gz kernel-ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df.zip | |
Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.
The microcode_core.c patch was provided by Stephen Rothwell
<[email protected]> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions