Merge branch 'for-next' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:36:35 +0000 (18:36 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:36:35 +0000 (18:36 +0100)
Conflicts:

kernel/irq/chip.c


Trivial merge