diff options
author | 2009-06-23 10:39:36 -0700 | |
---|---|---|
committer | 2009-06-23 10:39:36 -0700 | |
commit | 811e42cfba334d27797989ac8b0bea4981cb9581 (patch) | |
tree | 4641055622b331edd392e31ba32bf05bf9848a3c /include/linux/hugetlb.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (diff) | |
parent | libata: don't set IORDY for reset (diff) | |
download | wireguard-linux-811e42cfba334d27797989ac8b0bea4981cb9581.tar.xz wireguard-linux-811e42cfba334d27797989ac8b0bea4981cb9581.zip |
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:
libata: don't set IORDY for reset
sata_fsl: Add power mgmt support
[libata] PATA driver for CF interface on AT91SAM9260 SoC
[libata] beautify module parameters
Diffstat (limited to 'include/linux/hugetlb.h')
0 files changed, 0 insertions, 0 deletions