Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 17:58:27 +0000 (09:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 17:58:27 +0000 (09:58 -0800)
commitf564c5fe29d3fa9adc6d839714521b0554c62598
treed112824129cd01ee05acce915b32477718a62312
parent423ab71a8bd2345f87724abe320092a3a516b0bb
parentb887d3f2c63543dce1a0825e41be3a8d3ebef78d
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
include/asm-mips/io.h