diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-22 16:36:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-22 16:36:33 -0800 |
commit | 490a6e245e36ce27e10c32e1c3129fd782d3d1f3 (patch) | |
tree | aa9aa577215f65fc775ced09a99d5ce02e02d2a5 /drivers/acpi/sbs.c | |
parent | 66c669baa7d70b8d135da67f36c8dba12cea71b8 (diff) | |
parent | ec7080d185a9b79581bf1dbe300e877719c0b1a9 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[PATCH] make au1xxx-ide compile again
[MIPS] Hack for SB1 cache issues
Diffstat (limited to 'drivers/acpi/sbs.c')
0 files changed, 0 insertions, 0 deletions