diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 09:46:29 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 09:46:29 -0800 |
commit | 2927fceafc91afe744e0d1d33f8bbf98c42668fc (patch) | |
tree | b08de3a7caeb3e7f7844d460d0b0edad4387d968 /kernel | |
parent | 36f392d09670d41716e0ba29e1fd1d0445367687 (diff) | |
parent | ef183f6b5982aa10499432a0cb243c92ce623512 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
drivers/ide/palm_bk3710.c buildfix
ide: fix Falcon IDE breakage
ide: fix IDE PMAC breakage
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions