diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 22:32:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 22:32:02 -0400 |
| commit | 656ddf798dbe588217c97e58b9cfdfce649ebdc3 (patch) | |
| tree | e02659c481b7beb61b9f63c88e4cd200a4369517 /kernel/sched.c | |
| parent | 7e4720201ad44ace85a443f41d668a62a737e7d0 (diff) | |
| parent | 29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Fix oops introduced in non-uniform port handling fix
[PATCH] ata-piix: fixes kerneldoc error
Diffstat (limited to 'kernel/sched.c')
0 files changed, 0 insertions, 0 deletions