diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 14:44:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 14:44:11 -0400 |
| commit | afa153fd7b6afcd55dd6df6aea06bb53aa1d3608 (patch) | |
| tree | 87afe5df8802876a7937cfdcf977462c5c2399fe /fs/ntfs/usnjrnl.h | |
| parent | ba6271ea6324decab4c47c4a55de95188d930792 (diff) | |
| parent | 5a61dd9ec8c5a8e14fbccda3ab042555b692b9b2 (diff) | |
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/Kconfig: mark ide-scsi as deprecated
ide-disk: remove stale init_idedisk_capacity() documentation
palm_bk3710: improve IDE registration
ide: fix hwif_to_node()
IDE: palm_bk3710: fix compile warning for unused variable
IDE: compile fix for sff_dma_ops
Diffstat (limited to 'fs/ntfs/usnjrnl.h')
0 files changed, 0 insertions, 0 deletions