commit | d014d043869cdc591f3a33243d3481fa4479c2d0 | [log] [tgz] |
---|---|---|
author | Jiri Kosina <jkosina@suse.cz> | Mon Dec 07 18:36:35 2009 +0100 |
committer | Jiri Kosina <jkosina@suse.cz> | Mon Dec 07 18:36:35 2009 +0100 |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d [diff] | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 [diff] |
Merge branch 'for-next' into for-linus Conflicts: kernel/irq/chip.c