projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3346857 4bca328)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 19:04:37 +0000 (12:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 19:04:49 +0000 (12:04 -0700)
commit8c21f34126222239450717b78dda0c4962d9ebfa
tree3ed64c828f8bf8896e684a6ae471ed56b926b0d8tree | snapshot
parent3346857f6fab1d6d1237a3ec7cfa159ec9b52db5commit | diff
parent4bca3286433585b5f1c3e7d8ac37a2f4b3def9cacommit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Media rotation rate and form factor heuristics
  libata: Report disk alignment and physical block size
  sata_fsl: Fix the command description of FSL SATA controller
  sata_fsl: Fix compile warnings
  [libata] sata_sx4: fixup interrupt handling
  [libata] sata_sx4: convert to new exception handling methods
John Crispins staging tree