Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs
[pandora-kernel.git] / lib / cmdline.c
diff --cc lib/cmdline.c
Simple merge