diff options
author | 2009-02-17 14:16:02 -0800 | |
---|---|---|
committer | 2009-02-17 14:16:02 -0800 | |
commit | 0637810f24bad641d3d3f80fd3f63f3baffd9536 (patch) | |
tree | 13ff343e916e925deed298ca4abd1a73fd95c50b /arch/x86/mm/fault.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
parent | sata_nv: give up hardreset on nf2 (diff) | |
download | linux-dev-0637810f24bad641d3d3f80fd3f63f3baffd9536.tar.xz linux-dev-0637810f24bad641d3d3f80fd3f63f3baffd9536.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:
sata_nv: give up hardreset on nf2
libata-sff: fix 32-bit PIO ATAPI regression
Diffstat (limited to 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions