diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:23:08 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:15:56 -0700 |
| commit | 70888a4b412abd55c1710e2d36a9a00f4d23f474 (patch) | |
| tree | edcc428dcb5062823c0505deab3f6093c0fb40a5 /net/unix/af_unix.c | |
| parent | 47fad7c6f8d9f64780793cc67d8280259538c31c (diff) | |
| parent | c51423fc067b00d8c8bd0e4e7bc861bf9050511d (diff) | |
Merge branch 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
From: Linus Walleij <linus.walleij@linaro.org>:
Four core patches paving the way for device tree enablement
of the Snowball and ux500 at large by Lee Jones.
* 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions