diff options
| author | Olof Johansson <olof@lixom.net> | 2012-07-29 13:28:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-07-29 13:28:07 -0700 |
| commit | 15a1e1bafe2c924db6d370ad892d7da6c7d83598 (patch) | |
| tree | 99545a3f71307e5553b40a1082ca34714215ee4b /arch/s390/kernel/os_info.c | |
| parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) | |
| parent | f39c1101dd4489bca966974624fe19af1c8ebe23 (diff) | |
Merge branch 'marvell/dt' into late2/dt
* marvell/dt: (41 commits)
ARM: Kirkwood: Replace mrvl with marvell
ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
ARM: Kirkwood: Describe Dreamplug LEDs in DT.
ARM: Kirkwood: Describe iConnects LEDs in DT.
ARM: Kirkwood: Describe iConnects temperature sensor in DT.
ARM: Kirkwood: Describe IB62x0 LEDs in DT.
ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
ARM: Kirkwood: Use DT to configure SATA device.
ARM: kirkwood: use devicetree for SPI on dreamplug
ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
ARM: Kirkwood: Add basic device tree support for QNAP TS219.
ATA: sata_mv: Add device tree support
ARM: Orion: DTify the watchdog timer.
ARM: Orion: Add arch support needed for I2C via DT.
ARM: kirkwood: use devicetree for orion-spi
...
Diffstat (limited to 'arch/s390/kernel/os_info.c')
0 files changed, 0 insertions, 0 deletions