diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:46:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:46:47 +0200 |
| commit | 06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb (patch) | |
| tree | f8a55625cef3e754702add71acaf9958edfd8352 /Makefile | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | BAST: Remove old IDE driver (diff) | |
| download | linux-06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb.tar.xz linux-06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb.zip | |
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:
BAST: Remove old IDE driver
pcmcia ide kingston compactflash's have a new manufacturer id
pcmcia: add another pata/ide ID
pcmcia: add an pata/ide ID
ide: increase timeout in wait_drive_not_busy()
palm_bk3710: fix resource management
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions