diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-27 13:33:17 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-27 13:33:17 -0700 |
| commit | 25890ecda9fd00fad9bc53dea83fc58e0013fcdf (patch) | |
| tree | e99103ab8e2bc02c410b41420a473971fcf863f5 /autogen.sh | |
| parent | 965609f6fa63e28e5a28128f5bc44f8c4d7b9f68 (diff) | |
| parent | 117ff04b504578a24dff70659e2db1b81aaa1177 (diff) | |
Merge branch 'acpi-hotkey' into modesetting
Conflicts:
src/i830.h
src/i830_driver.c
Diffstat (limited to 'autogen.sh')
0 files changed, 0 insertions, 0 deletions