]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:25:28 +0000 (13:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:25:28 +0000 (13:25 -0800)
commitf91761c48bf0ce7ac8f8cb5aebfe9ad7e97bc6e8
tree1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203
parent93368613b495fe0fbd494bdaa42270b192d4cde4
parentd16e2a74cf68c2080ebf3a46fdc8551c0cc46dee
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] pata_jmicron: build fix