From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Dec 2009 22:22:36 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c9f937e4a3f4ebf9924ec21d80632e5eb61d949c;p=openwrt%2Fstaging%2Fblogic.git

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:
  pata_bf54x: handle portmuxing of pins through GPIO PORTs
---

c9f937e4a3f4ebf9924ec21d80632e5eb61d949c