Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 17:02:02 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 17:02:02 +0000 (10:02 -0700)
commitd620a7cf05d4f12f5bbb1060d766e8139ab31458
tree96123ef42b2c78b3c43fd46ea365e544353c6489
parent2aedd192f799c362ccefc3c316f0c4bd5154126b
parent45c4d015a92f72ec47acd0c7557abdc0c8a6499d
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: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)