tree 63626829498e647ba058a1ce06419fe7e4d5f97d
parent 6ec22f9b037fc0c2e00ddb7023fad279c365324d
parent 6070d81eb5f2d4943223c96e7609a53cdc984364
author Jiri Kosina <jkosina@suse.cz> 1260207395 +0100
committer Jiri Kosina <jkosina@suse.cz> 1260207395 +0100

Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c