aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:46:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:46:47 -0700
commit06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb (patch)
treef8a55625cef3e754702add71acaf9958edfd8352 /Makefile
parentd5545fa0056ff2982f8a6419bd9a6ba2674deefd (diff)
parentac1623625c5818bbdf5c68973098ba386ba7a004 (diff)
downloadlinux-stericsson-06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb.tar.gz
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 'Makefile')
0 files changed, 0 insertions, 0 deletions