Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git] / net / ipv6 / ip6_output.c
Simple merge