diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 10:00:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 10:00:03 -0700 |
commit | 27951daa71f1c91300ae4de9441916d1ffe2b078 (patch) | |
tree | 72d9ecde8c784c0837b7caf64b97fac5ffd5a424 /include/linux/ip_vs.h | |
parent | 59c288ffb6dfb55bdd6bfe6826ab6203ff791930 (diff) | |
parent | e8e7526c3c0863be25ab03a0871ee0978de5ba50 (diff) |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (28 commits)
ide-tape: fix debug call
alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC
ide-dma: don't reset request fields on dma_timeout_retry()
ide: drop rq->data handling from ide_map_sg()
ide-atapi: kill unused fields and callbacks
ide-tape: simplify read/write functions
ide-tape: use byte size instead of sectors on rw issue functions
ide-tape: unify r/w init paths
ide-tape: kill idetape_bh
ide-tape: use standard data transfer mechanism
ide-tape: use single continuous buffer
ide-atapi,tape,floppy: allow ->pc_callback() to change rq->data_len
ide-tape,floppy: fix failed command completion after request sense
ide-pm: don't abuse rq->data
ide-cd,atapi: use bio for internal commands
ide-atapi: convert ide-{floppy,tape} to using preallocated sense buffer
ide-cd: convert to using generic sense request
ide: add helpers for preparing sense requests
ide-cd: don't abuse rq->buffer
ide-atapi: don't abuse rq->buffer
...
Diffstat (limited to 'include/linux/ip_vs.h')
0 files changed, 0 insertions, 0 deletions