From: Jiri Kosina Date: Mon, 7 Dec 2009 17:36:35 +0000 (+0100) Subject: Merge branch 'for-next' into for-linus X-Git-Tag: v2.6.33-rc1~342^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d014d043869cdc591f3a33243d3481fa4479c2d0;p=pandora-kernel.git Merge branch 'for-next' into for-linus Conflicts: kernel/irq/chip.c --- d014d043869cdc591f3a33243d3481fa4479c2d0 Reading git-diff-tree failed