uthor Greg Kroah-Hartman <gregkh@suse.de> 1156392492 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> 1156392492 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
ANm��Kx