diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-08 19:50:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-08 19:50:09 -0800 |
| commit | 7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3 (patch) | |
| tree | 5da1a4088901063a04a6ee269d7195da6178a533 /net/unix/af_unix.c | |
| parent | EXPORTFS: handle NULL returns from fh_to_dentry()/fh_to_parent() (diff) | |
| parent | ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n (diff) | |
| download | linux-dev-7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3.tar.xz linux-dev-7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n
Revert "ide: respect current DMA setting during resume"
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions