diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 13:10:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 13:10:12 +1100 |
| commit | e3e2616289802e38e9a6841cf9e6ddc81d9b01c6 (patch) | |
| tree | 2414407d8a654e3ccb2028b0672424f71b15c90b /.gitignore | |
| parent | a6fedadea8d89317fb0071c9d24c05a83dcb3f89 (diff) | |
| parent | 48fb0085023f7824b77257879781d816fb64a6bc (diff) | |
Merge commit 'acpi/test'
Conflicts:
drivers/acpi/blacklist.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions