diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 10:29:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 10:29:09 -0700 |
| commit | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (patch) | |
| tree | a50b920260c7ccdb2da90bd6a064de168280beeb /drivers/net/ppp_async.c | |
| parent | Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| parent | ahci: add device ID for 82801JI sata controller (diff) | |
| download | linux-dev-35b5c55fee08e6e4001ba98060a2d0b82f70b5f4.tar.xz linux-dev-35b5c55fee08e6e4001ba98060a2d0b82f70b5f4.zip | |
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:
ahci: add device ID for 82801JI sata controller
drivers/ata: Move a dereference below a NULL test
libata: implement and use HORKAGE_NOSETXFER, take#2
libata: fix follow-up SRST failure path
Diffstat (limited to 'drivers/net/ppp_async.c')
0 files changed, 0 insertions, 0 deletions