projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7454c5 9ce41ae)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 16:37:57 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 16:37:57 +0000 (09:37 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  Revert "ide: skip probe if there are no devices on the port (v2)"
  Revert "via82cxxx: workaround h/w bugs"


Trivial merge
John Crispins staging tree