]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:22:36 +0000 (14:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:22:36 +0000 (14:22 -0800)
commitb93421e0607ce3731ad4f0af9d8573118978591e
tree9af0bad5961f4c5b8698fc2f24f746105663fc75
parent64565fcf58c0382feb59831f164dd8f4ee4ccbe8
parent7a466fe43bf3ae3d5f6c0c0ddcadeb56eeeeb7a4
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_bf54x: handle portmuxing of pins through GPIO PORTs