Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git] / lib / kstrtox.c
diff --cc lib/kstrtox.c
Simple merge