]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 16 Feb 2010 23:00:42 +0000 (10:00 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 16 Feb 2010 23:00:42 +0000 (10:00 +1100)
1  2 
arch/powerpc/platforms/pseries/xics.c

Simple merge