tree b207e157d9c82b6d328275c1c7d921ef4a584caf
parent 392eaef2e9f8e6527043ad8422d9cfea59ee6fb0
parent 8806048878fce541afe1d72cd2320f092519f90a
author Linus Torvalds <torvalds@linux-foundation.org> 1223491270 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223491270 -0700

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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