projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5545fa ac16236)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:46:47 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:46:47 +0000 (12:46 -0700)
commit06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb
treef8a55625cef3e754702add71acaf9958edfd8352tree | snapshot (tar.gz zip)
parentd5545fa0056ff2982f8a6419bd9a6ba2674deefdcommit | diff
parentac1623625c5818bbdf5c68973098ba386ba7a004commit | diff
Merge git://git./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