aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 12:29:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 12:29:39 -0700
commit2e13e5f03538cfded0c463fd60eddd0c8e2cd959 (patch)
treeb8a8d2e24c86ea2d15caca8851c9427631f72761 /drivers/char
parentccf5675a82a72bc1599b9b29cf33f7e391658485 (diff)
parent5920dadfb4aec6c1372c5570e71bcd3b4837e63c (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: accept late unlocking of HPA libata: Updates and fixes for pata_at91 driver ata_piix: Add new short cable ID ata_piix: Add new laptop short cable IDs ahci: add device IDs for Ibex Peak ahci controllers libata: remove superfluous NULL pointer checks libata: add missing NULL pointer check to ata_eh_reset() pata_pcmcia: add CNF-CDROM-ID
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions