diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-15 23:38:27 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-15 23:38:27 -0700 |
| commit | 88ab316f34b55acaeed5c96fcbe7758ea8dc5d67 (patch) | |
| tree | e427c0e17c99d94c107257f643c91a31b88b259d /drivers/scsi/sd.c | |
| parent | 5ddc9d6023c9b60f7e5b6c1658c3316cf915c3d1 (diff) | |
| parent | 697004aebfd847374f401dc852d2f2e107aa3096 (diff) | |
Merge tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu into next/boards
From Jason Cooper, mvebu defconfig changes for v3.12:
- kirkwood: add i2c devices, ext4, r8169
- mvebu: gpio-keys, input event
- dove: SI5351, PCI, xHCI
* tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
ARM: mvebu: add gpio-keys and input event support in defconfig
ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/scsi/sd.c')
0 files changed, 0 insertions, 0 deletions