diff options
| author | Linus Torvalds <[email protected]> | 2008-12-16 00:31:05 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-12-16 00:31:05 +0000 |
| commit | a3dd15444baa9c7522c8457ab564c41219dfb44c (patch) | |
| tree | 0571fdb4d7201376c03f474e2023144de62e8f1c /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [ARM] 5348/1: fix documentation wrt location of the alignment trap interface (diff) | |
| download | kernel-a3dd15444baa9c7522c8457ab564c41219dfb44c.tar.gz kernel-a3dd15444baa9c7522c8457ab564c41219dfb44c.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5348/1: fix documentation wrt location of the alignment trap interface
[ARM] Ensure linux/hardirqs.h is included where required
[ARM] fix kernel-doc syntax
[ARM] arch/arm/common/sa1111.c: Correct error handling code
[ARM] 5341/2: there is no copy_page on nommu ARM
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions