Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt

Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt

From Haojian Zhuang <haojian.zhuang@gmail.com>:

Three more patches for the pxa/dt branch. Since they're depending
on existing patch on pxa/dt branch, I didn't do rebase on v3.6-rc2

* 'dt' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix build issue while CONFIG_OF is disabled
  mtd: nand: append missing parameter and value
  ARM: pxa: append the definition of CKENC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>