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)
commitc9f937e4a3f4ebf9924ec21d80632e5eb61d949c
tree9af0bad5961f4c5b8698fc2f24f746105663fc75
parent2218a4fcf3cddd076aaf8855f675ce77f74a500b
parent3439d65062a4af6af0433c8816fd54697d782ff4
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