Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Having missed the merge window, update to 3.6-rc2 to avoid conflicts with
new patches.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --cc arch/arm/boot/dts/imx51.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx53.dtsi
Simple merge

diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
Simple merge

diff --cc drivers/mtd/mtdoops.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge