diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-07 13:23:39 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-07 13:23:39 -0400 |
| commit | dbee3f2a121c5ed584cf8ae745d0a625ddf51a2e (patch) | |
| tree | a81a86528ecc66b51f64196039d77c258fc43ec7 /fs/btrfs/async-thread.h | |
| parent | a32d8c0e840dd7b9cf18e4919497991c00e3cedb (diff) | |
| parent | 741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5 (diff) | |
Merge tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
From Linus Walleij:
Second part of the Ux500 devicetree conversion and ATAG
deletion: this fixes bugs discovered when switching to a
devicetree-only setup, primarily on the HREF prototypes.
The biggest change is to split into four DTS variants as
the UIB autodetection was lost.
* tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
ARM: ux500: register the tc35892 GPIO on the TVK UIB
ARM: ux500: split the HREF DTS files from two to four
ARM: ux500: split HREF UIB files
ARM: ux500: move TC35892 at 0x42 to hrefprev60
ARM: ux500: correct CD for micro SD on hrev60plus
ARM: ux500: fix proximity sensor button
ARM: ux500: correct I2C address of ambient light sensor
ARM: ux500 enable the AB8500 gpio for all HREFs
ARM: ux500: add default trigger on HREF LED
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/btrfs/async-thread.h')
0 files changed, 0 insertions, 0 deletions