| commit | c9f937e4a3f4ebf9924ec21d80632e5eb61d949c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 22 14:22:36 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 22 14:22:36 2009 -0800 |
| tree | 9af0bad5961f4c5b8698fc2f24f746105663fc75 | |
| parent | 2218a4fcf3cddd076aaf8855f675ce77f74a500b [diff] | |
| parent | 3439d65062a4af6af0433c8816fd54697d782ff4 [diff] |
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