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:
  alim15x3: disable init_hwif_ali15x3 for PowerPC
  ide: fix crash at boot with siimage driver

...

This commit is contained in:

Linus Torvalds 2008-04-29 14:01:25 -07:00

parent 355a46961b 6d1cee4436

commit eeb85d0b0e

2 changed files with 13 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

10

drivers/ide/pci/alim15x3.c

View file

9

drivers/ide/pci/siimage.c

View file