diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-14 02:29:03 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-14 02:29:03 +0200 |
commit | ddb503b42960792f3be580f98959add669241a04 (patch) | |
tree | 81b4fa600ac88bb70874d0b892e72521cbe9c8c0 /drivers/ata/libata-eh.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | alpha: Wire up syscalls new to 2.6.39 (diff) | |
download | linux-ddb503b42960792f3be580f98959add669241a04.tar.xz linux-ddb503b42960792f3be580f98959add669241a04.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Wire up syscalls new to 2.6.39
alpha: convert to clocksource_register_hz
Diffstat (limited to 'drivers/ata/libata-eh.c')
0 files changed, 0 insertions, 0 deletions