projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93cd791 f3769e9)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Apr 2007 00:25:28 +0000 (17:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Apr 2007 00:25:28 +0000 (17:25 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_sis: Fix oops on boot


Trivial merge
John Crispins staging tree