diff options
| author | Linus Torvalds <[email protected]> | 2011-01-25 23:04:18 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-01-25 23:04:18 +0000 |
| commit | 6663050edd9c2e8b1e1f55c09459144d84c045f0 (patch) | |
| tree | f683d34d517465d62dcf2fd311f8f6e5d7e736b0 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| parent | Merge branch 'mmci' into fixes (diff) | |
| download | kernel-6663050edd9c2e8b1e1f55c09459144d84c045f0.tar.gz kernel-6663050edd9c2e8b1e1f55c09459144d84c045f0.zip | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ALSA: AACI: fix timeout duration
ALSA: AACI: fix timeout condition checking
ARM: 6636/1: ep93xx: default multiplexed gpio ports to gpio mode
ARM: 6637/1: Make the argument to virt_to_phys() "const volatile"
ARM: twd: ensure timer reload is reprogrammed on entry to periodic mode
ARM: 6635/2: Configure reference clock for Versatile Express timers
ARM: versatile: name configuration options after actual board names
ARM: realview: name configuration options after actual board names
ARM: realview,vexpress: fix section mismatch warning for pen_release
ARM: 6632/3: mmci: stop using the blockend interrupts
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions