Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2009-01-26 09:46:29 -08:00

parent 36f392d096 ef183f6b59

commit 2927fceafc

3 changed files with 10 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/ide/falconide.c

View file

3

drivers/ide/ide-probe.c

View file

11

drivers/ide/palm_bk3710.c

View file