diff options
| author | Linus Torvalds <[email protected]> | 2011-01-25 23:02:55 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-01-25 23:02:55 +0000 |
| commit | 01ed875a12eacd5ece370b20ccf8f51543feb172 (patch) | |
| tree | f999e0050439dc8e958351f43ec0545191a2a206 /net/unix/af_unix.c | |
| parent | Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | m68k/amiga: Fix "debug=mem" (diff) | |
| download | kernel-01ed875a12eacd5ece370b20ccf8f51543feb172.tar.gz kernel-01ed875a12eacd5ece370b20ccf8f51543feb172.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/amiga: Fix "debug=mem"
m68k/atari: Rename "scc" to "atari_scc"
m68k: Uninline strchr()
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions