Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:48:14 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:48:14 +0000 (14:48 -0700)
commit7c22a3d853804d2716ef4f90cdd693a83819ba11
treeb0f5f71166c85e4178d9b3658be9a2ab35591bd6
parent0cb60efd03ed82d02f44a14594714367e59e8abc
parent97b697a11b07e2ebfa69c488132596cc5eb24119
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] LBA28/LBA48 off-by-one bug in ata.h
  sata_inic162x: enable LED blinking
  ata: duplicate variable sparse warning