diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 10:02:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 10:02:15 -0700 |
commit | c09bca786ff941ed17c5f381c4eca5b106808c51 (patch) | |
tree | 9b79a2f2d3ac441551c9c367f22e2240040c4ef6 /fs/lockd/svc.c | |
parent | e76e5b2c663ac74ae6a542ac20795c625e36a5cd (diff) | |
parent | 5b6c942dd1f13835eff8105ec2aa859544a1498d (diff) | |
download | kernel-crypto-c09bca786ff941ed17c5f381c4eca5b106808c51.tar.gz kernel-crypto-c09bca786ff941ed17c5f381c4eca5b106808c51.tar.xz kernel-crypto-c09bca786ff941ed17c5f381c4eca5b106808c51.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: (59 commits)
ide-floppy: do not complete rq's prematurely
ide: be able to build pmac driver without IDE built-in
ide-pmac: IDE cable detection on Apple PowerBook
ide: inline SELECT_DRIVE()
ide: turn selectproc() method into dev_select() method (take 5)
MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
ide: move data register access out of tf_{read|load}() methods (take 2)
ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
ide-io-std: shorten ide_{in|out}put_data()
ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
ide: turn set_irq() method into write_devctl() method
ide: use ATA_HOB
ide-disk: use ATA_ERR
ide: add support for CFA specified transfer modes (take 3)
ide-iops: only clear DMA words on setting DMA mode
ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
au1xxx-ide: auide_{in|out}sw() should be static
ide-floppy: use ide_pio_bytes()
ide-{floppy,tape}: fix padding for PIO transfers
ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option
...
Diffstat (limited to 'fs/lockd/svc.c')
0 files changed, 0 insertions, 0 deletions