diff options
| author | Ingo Molnar <[email protected]> | 2008-11-28 14:00:37 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-11-28 14:00:48 +0000 |
| commit | 3bdae4f46445ea7cc9ee031d7ff106fdc6228669 (patch) | |
| tree | a44b445548dbf730535cfebd024e4cabadd4397c /net/unix/af_unix.c | |
| parent | x86: entry_64.S - trivial: space, comments fixup (diff) | |
| parent | x86, debug: remove the confusing entry in call trace (diff) | |
| download | kernel-3bdae4f46445ea7cc9ee031d7ff106fdc6228669.tar.gz kernel-3bdae4f46445ea7cc9ee031d7ff106fdc6228669.zip | |
Merge branch 'x86/debug' into x86/irq
We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions