Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commit69849375d6b13e94d08cdc94b49b11fbab454a0e
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Oct 2008 18:41:10 +0000 (8 11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Oct 2008 18:41:10 +0000 (8 11:41 -0700)
treeb207e157d9c82b6d328275c1c7d921ef4a584caf
parent392eaef2e9f8e6527043ad8422d9cfea59ee6fb0
parent8806048878fce541afe1d72cd2320f092519f90a
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur