diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 14:04:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 14:04:29 -0500 |
| commit | 70e66a5079b2b33f142303d31581cf03f7af98fe (patch) | |
| tree | 3160fb22716de0407d87ec9de6135127ed7c1fed /net/sched/act_ipt.c | |
| parent | eca9dfcd0029c8a84b1094bb84a2fb53e4addf6c (diff) | |
| parent | 0535f2bc170bc0779ac471faff39f633ca19ab59 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv: remove pointless NULL test
pata_hpt3x2n: fix clock turnaround
libata: fix reporting of drained bytes when clearing DRQ
sata_mv: add power management support for the PCI controllers.
sata_mv: store the board_idx into the host private data
pata_octeon_cf: use resource_size(), to fix resource sizing bug
libata: use the WRITE_SAME_16 define
sata_mv: move the PCI bar description initialization code
sata_mv: add power management support for the platform driver
sata_mv: support clkdev framework
sata_mv: increase PIO IORDY timeout
Fixed crazy mode-change in merge.
Diffstat (limited to 'net/sched/act_ipt.c')
0 files changed, 0 insertions, 0 deletions