projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbe5a96 d15d6e6)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 03:54:49 +0000 (20:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 03:54:49 +0000 (20:54 -0700)
commitca9a702e50287cf429f1c12832319a26a715e70b
treea29c7c68d2945c47d058b42ecd4475fed5c19fe2tree | snapshot
parentbbe5a96f678efcad83de8f900ab4ab963a99c805commit | diff
parentd15d6e6cc340566d53d953ffdec2c9e96816fa52commit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
  pata_amd: do not filter out valid modes in nv_mode_filter
  sata_promise: update reset code
  sata_promise: disable hotplug on 1st gen chips
  libata: fix spurious WARN_ON_ONCE() on port freeze
  ahci: restore pci_intx() handling
John Crispins staging tree