diff options
| author | Linus Torvalds <[email protected]> | 2011-01-18 16:03:55 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-01-18 16:03:55 +0000 |
| commit | 34c682adb30e9602e92f044056c142f69b4a6cfe (patch) | |
| tree | a57e83edadf6cd34b1966c7e10d7ef6de4bf5313 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | ARM: S5PV310: Add missing virtual ASoC DMA device (diff) | |
| download | kernel-34c682adb30e9602e92f044056c142f69b4a6cfe.tar.gz kernel-34c682adb30e9602e92f044056c142f69b4a6cfe.zip | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV310: Add missing virtual ASoC DMA device
ARM: S5PV210: Add missing virtual ASoC DMA device
ARM: S5P6450: Add missing virtual ASoC DMA device
ARM: S5P6440: Add missing virtual ASoC DMA device
ARM: S5P6442: Enable I2S device to work on SMDK6442
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions