summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-15 19:29:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-15 19:29:09 +0200
commit35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (patch)
treea50b920260c7ccdb2da90bd6a064de168280beeb /arch/blackfin
parentMerge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux (diff)
parentahci: add device ID for 82801JI sata controller (diff)
downloadlinux-35b5c55fee08e6e4001ba98060a2d0b82f70b5f4.tar.xz
linux-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 'arch/blackfin')
0 files changed, 0 insertions, 0 deletions