| commit | 5cbee140a28c2746449ae31e85738043ae4da927 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Aug 20 08:01:03 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Aug 20 08:01:03 2012 +0200 |
| tree | 5bc12e0ee64d71544a0f90d2a63a0c8acd8d2014 | |
| parent | 71f8e5b260e17a428dd7513c7d1e01777b69139b [diff] | |
| parent | e6c509c8ef85155bf504254399d758384a3b2e38 [diff] |
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>